Hiroshi DOYU
9ae0ee0076
omap mailbox: move mailbox.h into mailbox.c
...
no need to keep mailbox.h separately.
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:26 -07:00
Hiroshi DOYU
c75ee7520b
omap mailbox: add save_/restore_ctx() for PM
...
To preserve the registers during off-mode
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:26 -07:00
Hiroshi DOYU
da8cfe03a4
omap mailbox: fix empty struct device for omap2
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:25 -07:00
Hiroshi DOYU
f98d67a07e
omap mailbox: fix empty struct device for omap1
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:25 -07:00
Hiroshi DOYU
f48cca8770
omap mailbox: fix empty struct device for omap_mbox
...
Since "mbox->dev" doesn't exist and isn't created either at
registration, this patch will create "struct device", which belongs to
"omap-mailbox" class and set this pointer for the member of
"struct omap_mbox".
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:24 -07:00
Hiroshi DOYU
94fc58c6da
omap mailbox: print hardware revision at startup
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:24 -07:00
Hiroshi DOYU
6c20a68372
omap mailbox: add initial omap3 support
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:23 -07:00
Hiroshi DOYU
733ecc5c06
omap mailbox: cleanup omap2 register definition with macro
...
Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
2009-03-23 18:07:23 -07:00
James Morris
703a3cd728
Merge branch 'master' into next
2009-03-24 10:52:46 +11:00
Takashi Iwai
c441c2971d
Merge branch 'topic/usb-caiaq' into for-linus
2009-03-24 00:36:23 +01:00
Takashi Iwai
afad17c0ae
Merge branch 'topic/usb-audio' into for-linus
2009-03-24 00:36:22 +01:00
Takashi Iwai
d080732334
Merge branch 'topic/sscape-fix' into for-linus
2009-03-24 00:36:21 +01:00
Takashi Iwai
d7b6df5d1a
Merge branch 'topic/powermac' into for-linus
2009-03-24 00:36:20 +01:00
Takashi Iwai
7df4f69435
Merge branch 'topic/pcxhr' into for-linus
2009-03-24 00:36:19 +01:00
Takashi Iwai
b54fc8dd2c
Merge branch 'topic/oxygen' into for-linus
2009-03-24 00:36:17 +01:00
Takashi Iwai
9fb5430c3d
Merge branch 'topic/oss-fix' into for-linus
2009-03-24 00:36:16 +01:00
Takashi Iwai
4c5ecb7e59
Merge branch 'topic/msnd' into for-linus
2009-03-24 00:36:15 +01:00
Takashi Iwai
fa15fdeffa
Merge branch 'topic/isa-misc' into for-linus
2009-03-24 00:36:13 +01:00
Takashi Iwai
843ad02fa4
Merge branch 'topic/intel8x0' into for-linus
2009-03-24 00:36:13 +01:00
Takashi Iwai
60c4e7c120
Merge branch 'topic/ice' into for-linus
2009-03-24 00:36:12 +01:00
Takashi Iwai
593aff6c50
Merge branch 'topic/hdsp' into for-linus
2009-03-24 00:36:10 +01:00
Takashi Iwai
e7bfbb0215
Merge branch 'topic/hda' into for-linus
2009-03-24 00:36:09 +01:00
Takashi Iwai
fe506d6bc5
Merge branch 'topic/emu10k1' into for-linus
2009-03-24 00:36:08 +01:00
Takashi Iwai
c9294e4b37
Merge branch 'topic/echoaudio' into for-linus
2009-03-24 00:36:07 +01:00
Takashi Iwai
ae02cde7e9
Merge branch 'topic/drop-l3' into for-linus
2009-03-24 00:36:05 +01:00
Takashi Iwai
f11a936fe7
Merge branch 'topic/docbook-fix' into for-linus
2009-03-24 00:36:02 +01:00
Takashi Iwai
a3c6048dcf
Merge branch 'topic/cs423x-merge' into for-linus
2009-03-24 00:35:59 +01:00
Takashi Iwai
87cd9d7c85
Merge branch 'topic/ca0106' into for-linus
2009-03-24 00:35:58 +01:00
Takashi Iwai
158c1529fe
Merge branch 'topic/atmel' into for-linus
2009-03-24 00:35:56 +01:00
Takashi Iwai
b5c784894c
Merge branch 'topic/asoc' into for-linus
2009-03-24 00:35:53 +01:00
Takashi Iwai
ff4fc3656e
Merge branch 'topic/aoa' into for-linus
2009-03-24 00:35:51 +01:00
Takashi Iwai
e0d2054fd3
Merge branch 'topic/misc' into for-linus
2009-03-24 00:35:50 +01:00
Takashi Iwai
d807500a24
Merge branch 'topic/pcm-cleanup' into for-linus
2009-03-24 00:35:49 +01:00
Takashi Iwai
c7ccfd060f
Merge branch 'topic/ioctl-use-define' into for-linus
2009-03-24 00:35:48 +01:00
Takashi Iwai
ec6659c389
Merge branch 'topic/vmaster-update' into for-linus
2009-03-24 00:35:47 +01:00
Takashi Iwai
c944a93df0
Merge branch 'topic/rawmidi-fix' into for-linus
2009-03-24 00:35:46 +01:00
Takashi Iwai
65b3864b85
Merge branch 'topic/ctl-list-cleanup' into for-linus
2009-03-24 00:35:45 +01:00
Takashi Iwai
bafdb7278c
Merge branch 'topic/quirk-cleanup' into for-linus
2009-03-24 00:35:44 +01:00
Takashi Iwai
5b56eec774
Merge branch 'topic/jack' into for-linus
2009-03-24 00:35:43 +01:00
Takashi Iwai
c2f43981e5
Merge branch 'topic/hwdep-cleanup' into for-linus
2009-03-24 00:35:41 +01:00
Takashi Iwai
dec14f8c0e
Merge branch 'topic/snd_card_new-err' into for-linus
2009-03-24 00:35:35 +01:00
David S. Miller
039a6f6a39
ucc_geth: Fix merge error.
...
I left a merge failure unresolved, noticed by Stephen
Rothwell.
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-03-23 16:21:16 -07:00
Linus Torvalds
8e0ee43bc2
Linux 2.6.29
2009-03-23 16:12:14 -07:00
Chris Dearman
9fb4c2b9e0
MIPS: R2: Fix problem with code that incorrectly modifies ebase.
...
Commit 566f74f6b2
had a change that
incorrectly modified ebase. This backs out the lines that modified
ebase.
In addition, the ebase exception vector is now allocated with correct
alignment and the ebase register updated according to the architecture
specification.
Based on original patch by David VomLehn <dvomlehn@cisco.com>.
Signed-off-by: David VomLehn <dvomlehn@cisco.com>
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-03-23 23:38:05 +01:00
Ralf Baechle
89e18eb331
MIPS: Change {set,clear,change}_c0_<foo> to return old value.
...
This is more standard and useful and need for the following fix to work
correctly.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-03-23 23:38:05 +01:00
Huang Weiyi
5484879c0a
MIPS: compat: Remove duplicated #include
...
Remove duplicated #include in arch/mips/kernel/linux32.c.
Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-03-23 23:38:05 +01:00
Shinya Kuribayashi
5864810bc5
MIPS: VR5500: Enable prefetch
...
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-03-23 23:38:04 +01:00
Jan Nikitenko
d700119836
MIPS: Fix oops in dma_unmap_page on not coherent mips platforms
...
dma_cache_wback_inv() expects virtual address, but physical was provided
due to translation via plat_dma_addr_to_phys().
If replaced with dma_addr_to_virt(), page fault oops from dma_unmap_page()
is gone on au1550 platform.
Signed-off-by: Jan Nikitenko <jan.nikitenko@gmail.com>
Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2009-03-23 23:38:04 +01:00
Anton Vorontsov
18f27383d9
fsl_pq_mdio: Use proper address translation
...
Currently the driver just read "reg" property for constructing MDIO
bus IDs, but this won't work when we'll start using "ranges = <>" in
the device tree, so this will pop up:
Freescale PowerQUICC MII Bus: probed
sysfs: duplicate filename 'mdio@520' can not be created
------------[ cut here ]------------
Badness at c00cb6b8 [verbose debug info unavailable]
NIP: c00cb6b8 LR: c00cb6b8 CTR: c001271c
REGS: cf82fc10 TRAP: 0700 Not tainted (2.6.29-rc7-03702-g7ccd10f)
MSR: 00029032 <EE,ME,CE,IR,DR> CR: 42044022 XER: 20000000
TASK = cf81fbd0[1] 'swapper' THREAD: cf82e000
GPR00: c00cb6b8 cf82fcc0 cf81fbd0 0000003b 00000e42 ffffffff 00004000 00000e42
GPR08: c03cb0fc c03bfbdc 00000e42 c03cac50 22044022 1006a2bc 0ffcb000 00000000
GPR16: 0ffc04b0 0ffc5a40
00000000 0ffc79a8 0f7863a8 00000004 00000000 00000000
GPR24: c033a6a8 d1014520 cf85e840 cf82fd08 cf87cf2c cf82fcd8 cf85dea8 ffffffef
NIP [c00cb6b8] sysfs_add_one+0x4c/0x54
LR [c00cb6b8] sysfs_add_one+0x4c/0x54
Call Trace:
[cf82fcc0] [c00cb6b8] sysfs_add_one+0x4c/0x54 (unreliable)
[cf82fcd0] [c00cbc18] create_dir+0x58/0xc0
[cf82fd00] [c00cbcc0] sysfs_create_dir+0x40/0x70
[cf82fd20] [c0159388] create_dir+0x28/0x78
[cf82fd30] [c0159824] kobject_add_internal+0x98/0x13c
[cf82fd50] [c0159e98] kobject_add+0x60/0x98
[cf82fd80] [c018a480] device_add+0x98/0x2ac
[cf82fda0] [c01a2380] mdiobus_register+0xbc/0x1c0
[cf82fdc0] [c019f31c] fsl_pq_mdio_probe+0x284/0x2a0
[cf82fe00] [c0223814] of_platform_device_probe+0x5c/0x84
...
This patch fixes the issue by translating the "reg" property to a full
address, and thus avoids the duplicate names.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-03-23 15:37:09 -07:00
Vitaly Mayatskikh
30842f2989
udp: Wrong locking code in udp seq_file infrastructure
...
Reading zero bytes from /proc/net/udp or other similar files which use
the same seq_file udp infrastructure panics kernel in that way:
=====================================
[ BUG: bad unlock balance detected! ]
-------------------------------------
read/1985 is trying to release lock (&table->hash[i].lock) at:
[<ffffffff81321d83>] udp_seq_stop+0x27/0x29
but there are no more locks to release!
other info that might help us debug this:
1 lock held by read/1985:
#0 : (&p->lock){--..}, at: [<ffffffff810eefb6>] seq_read+0x38/0x348
stack backtrace:
Pid: 1985, comm: read Not tainted 2.6.29-rc8 #9
Call Trace:
[<ffffffff81321d83>] ? udp_seq_stop+0x27/0x29
[<ffffffff8106dab9>] print_unlock_inbalance_bug+0xd6/0xe1
[<ffffffff8106db62>] lock_release_non_nested+0x9e/0x1c6
[<ffffffff810ef030>] ? seq_read+0xb2/0x348
[<ffffffff8106bdba>] ? mark_held_locks+0x68/0x86
[<ffffffff81321d83>] ? udp_seq_stop+0x27/0x29
[<ffffffff8106dde7>] lock_release+0x15d/0x189
[<ffffffff8137163c>] _spin_unlock_bh+0x1e/0x34
[<ffffffff81321d83>] udp_seq_stop+0x27/0x29
[<ffffffff810ef239>] seq_read+0x2bb/0x348
[<ffffffff810eef7e>] ? seq_read+0x0/0x348
[<ffffffff8111aedd>] proc_reg_read+0x90/0xaf
[<ffffffff810d878f>] vfs_read+0xa6/0x103
[<ffffffff8106bfac>] ? trace_hardirqs_on_caller+0x12f/0x153
[<ffffffff810d88a2>] sys_read+0x45/0x69
[<ffffffff8101123a>] system_call_fastpath+0x16/0x1b
BUG: scheduling while atomic: read/1985/0xffffff00
INFO: lockdep is turned off.
Modules linked in: cpufreq_ondemand acpi_cpufreq freq_table dm_multipath kvm ppdev snd_hda_codec_analog snd_hda_intel snd_hda_codec snd_hwdep snd_seq_dummy snd_seq_oss snd_seq_midi_event arc4 snd_s
eq ecb thinkpad_acpi snd_seq_device iwl3945 hwmon sdhci_pci snd_pcm_oss sdhci rfkill mmc_core snd_mixer_oss i2c_i801 mac80211 yenta_socket ricoh_mmc i2c_core iTCO_wdt snd_pcm iTCO_vendor_support rs
rc_nonstatic snd_timer snd lib80211 cfg80211 soundcore snd_page_alloc video parport_pc output parport e1000e [last unloaded: scsi_wait_scan]
Pid: 1985, comm: read Not tainted 2.6.29-rc8 #9
Call Trace:
[<ffffffff8106b456>] ? __debug_show_held_locks+0x1b/0x24
[<ffffffff81043660>] __schedule_bug+0x7e/0x83
[<ffffffff8136ede9>] schedule+0xce/0x838
[<ffffffff810d7972>] ? fsnotify_access+0x5f/0x67
[<ffffffff810112d0>] ? sysret_careful+0xb/0x37
[<ffffffff8106be9c>] ? trace_hardirqs_on_caller+0x1f/0x153
[<ffffffff8137127b>] ? trace_hardirqs_on_thunk+0x3a/0x3f
[<ffffffff810112f6>] sysret_careful+0x31/0x37
read[1985]: segfault at 7fffc479bfe8 ip 0000003e7420a180 sp 00007fffc479bfa0 error 6
Kernel panic - not syncing: Aiee, killing interrupt handler!
udp_seq_stop() tries to unlock not yet locked spinlock. The lock was lost
during splitting global udp_hash_lock to subsequent spinlocks.
Signed-off by: Vitaly Mayatskikh <v.mayatskih@gmail.com>
Acked-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2009-03-23 15:22:33 -07:00