OSDN Git Service
Manuel Lauss [Wed, 22 Nov 2006 13:51:32 +0000 (14:51 +0100)]
[PATCH] make au1xxx-ide compile again
The Au1xx IDE controller driver doesn't compile:
CC drivers/ide/mips/au1xxx-ide.o
/linux-2.6.19-rc6-work/drivers/ide/mips/au1xxx-ide.c:480: error: conflicting types for 'auide_ddma_tx_callback'
include2/asm/mach-au1x00/au1xxx_ide.h:174: error: previous declaration of 'auide_ddma_tx_callback' was here
/linux-2.6.19-rc6-work/drivers/ide/mips/au1xxx-ide.c:486: error: conflicting types for 'auide_ddma_rx_callback'
include2/asm/mach-au1x00/au1xxx_ide.h:176: error: previous declaration of 'auide_ddma_rx_callback' was here
Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Thiemo Seufer [Thu, 16 Nov 2006 22:13:54 +0000 (22:13 +0000)]
[MIPS] Hack for SB1 cache issues
Removing flush_icache_page a while ago broke SB1 which was using an empty
flush_data_cache_page function. This glues things well enough so a more
efficient but also more intrusive solution can be found later.
Signed-Off-By: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Linus Torvalds [Wed, 22 Nov 2006 02:42:44 +0000 (18:42 -0800)]
Merge branch 'merge' of /linux/kernel/git/paulus/powerpc
* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Fix ucc_geth of_device discovery on mpc832x
[POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class"
[POWERPC] Revert "[POWERPC] Enable generic rtc hook for the MPC8349 mITX"
Linus Torvalds [Wed, 22 Nov 2006 02:36:59 +0000 (18:36 -0800)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[TG3]: Add missing unlock in tg3_open() error path.
[IPV6]: Fix address/interface handling in UDP and DCCP, according to the scoping architecture.
[IRDA]: Lockdep fix.
[BLUETOOTH]: Fix unaligned access in hci_send_to_sock.
[XFRM]: nlmsg length not computed correctly in the presence of subpolicies
[XFRM]: Sub-policies broke policy events
[IGMP]: Fix IGMPV3_EXP() normalization bit shift value.
[Bluetooth] Ignore L2CAP config requests on disconnect
[Bluetooth] Always include MTU in L2CAP config responses
[Bluetooth] Check if RFCOMM session is still attached to the TTY
[Bluetooth] Handling pending connect attempts after inquiry
[Bluetooth] Attach low-level connections to the Bluetooth bus
[IPV6] IP6TUNNEL: Add missing nf_reset() on input path.
[IPV6] IP6TUNNEL: Delete all tunnel device when unloading module.
[IPV6] ROUTE: Do not enable router reachability probing in router mode.
[IPV6] ROUTE: Prefer reachable nexthop only if the caller requests.
[IPV6] ROUTE: Try to use router which is not known unreachable.
Kim Phillips [Wed, 22 Nov 2006 00:19:42 +0000 (18:19 -0600)]
[POWERPC] Fix ucc_geth of_device discovery on mpc832x
mpc832x, as in mpc8360, needs to explicitly find and create the
platform device for ucc_geth in 2.6.19. This code will likely be
readapted to Benh's new of_ methods for 2.6.20.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Ira W. Snyder [Wed, 22 Nov 2006 01:44:31 +0000 (17:44 -0800)]
[TG3]: Add missing unlock in tg3_open() error path.
Sparse noticed a locking imbalance in tg3_open(). This patch adds an
unlock to one of the error paths, so that tg3_open() always exits
without the lock held.
Signed-off-by: Ira W. Snyder <kernel@irasnyder.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
YOSHIFUJI Hideaki [Wed, 22 Nov 2006 01:41:56 +0000 (17:41 -0800)]
[IPV6]: Fix address/interface handling in UDP and DCCP, according to the scoping architecture.
TCP and RAW do not have this issue. Closes Bug #7432.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Peter Zijlstra [Wed, 22 Nov 2006 01:33:01 +0000 (17:33 -0800)]
[IRDA]: Lockdep fix.
On Sat, 2006-11-18 at 16:12 +0300, Andrey Borzenkov wrote:
> =============================================
> [ INFO: possible recursive locking detected ]
> 2.6.19-rc5-2avb #2
> - ---------------------------------------------
> pppd/26425 is trying to acquire lock:
> (&hashbin->hb_spinlock){....}, at: [<
dfdea87a>] irlmp_slsap_inuse+0x5a/0x170
> [irda]
>
> but task is already holding lock:
> (&hashbin->hb_spinlock){....}, at: [<
dfdea857>] irlmp_slsap_inuse+0x37/0x170
> [irda]
>
> other info that might help us debug this:
> 1 lock held by pppd/26425:
> #0: (&hashbin->hb_spinlock){....}, at: [<
dfdea857>]
> irlmp_slsap_inuse+0x37/0x170 [irda]
>
> stack backtrace:
> [<
c010413c>] dump_trace+0x1cc/0x200
> [<
c010418a>] show_trace_log_lvl+0x1a/0x30
> [<
c01047f2>] show_trace+0x12/0x20
> [<
c01048c9>] dump_stack+0x19/0x20
> [<
c01346ca>] __lock_acquire+0x8fa/0xc20
> [<
c0134d2d>] lock_acquire+0x5d/0x80
> [<
c02a851c>] _spin_lock+0x2c/0x40
> [<
dfdea87a>] irlmp_slsap_inuse+0x5a/0x170 [irda]
> [<
dfdebab2>] irlmp_open_lsap+0x62/0x180 [irda]
> [<
dfdf35d1>] irttp_open_tsap+0x181/0x230 [irda]
> [<
dfdc0c3d>] ircomm_open_tsap+0x5d/0xa0 [ircomm]
> [<
dfdc05d8>] ircomm_open+0xb8/0xd0 [ircomm]
> [<
dfdd0477>] ircomm_tty_open+0x4f7/0x570 [ircomm_tty]
> [<
c020bbe4>] tty_open+0x174/0x340
> [<
c016bd69>] chrdev_open+0x89/0x170
> [<
c0167bd6>] __dentry_open+0xa6/0x1d0
> [<
c0167da5>] nameidata_to_filp+0x35/0x40
> [<
c0167df9>] do_filp_open+0x49/0x50
> [<
c0167e47>] do_sys_open+0x47/0xd0
> [<
c0167f0c>] sys_open+0x1c/0x20
> [<
c010307d>] sysenter_past_esp+0x56/0x8d
> [<
b7f86410>] 0xb7f86410
> =======================
The comment at the nesting lock says:
/* Careful for priority inversions here !
* irlmp->links is never taken while another IrDA
* spinlock is held, so we are safe. Jean II */
So, under the assumption the author was right, it just needs a lockdep
annotation.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Kim Phillips [Tue, 21 Nov 2006 16:31:14 +0000 (10:31 -0600)]
[POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class"
This reverts commit
7a69af63e788a324d162201a0b23df41bcf158dd.
As advised by David Brownell:
http://marc.theaimsgroup.com/?l=linux-kernel&m=
116387226902131&w=2
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Kim Phillips [Tue, 21 Nov 2006 16:31:08 +0000 (10:31 -0600)]
[POWERPC] Revert "[POWERPC] Enable generic rtc hook for the MPC8349 mITX"
This reverts commit
a8ed4f7ec3aa472134d7de6176f823b2667e450b.
As advised by David Brownell:
http://marc.theaimsgroup.com/?l=linux-kernel&m=
116387226902131&w=2
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
David S. Miller [Wed, 22 Nov 2006 00:17:41 +0000 (16:17 -0800)]
[BLUETOOTH]: Fix unaligned access in hci_send_to_sock.
The "u16 *" derefs of skb->data need to be wrapped inside of
a get_unaligned().
Thanks to Gustavo Zacarias for the bug report.
Signed-off-by: David S. Miller <davem@davemloft.net>
Jamal Hadi Salim [Sun, 19 Nov 2006 22:55:30 +0000 (14:55 -0800)]
[XFRM]: nlmsg length not computed correctly in the presence of subpolicies
I actually dont have a test case for these; i just found them by
inspection. Refer to patch "[XFRM]: Sub-policies broke policy events"
for more info
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Acked-by: Masahide NAKAMURA <nakam@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Jamal Hadi Salim [Sun, 19 Nov 2006 22:53:07 +0000 (14:53 -0800)]
[XFRM]: Sub-policies broke policy events
XFRM policy events are broken when sub-policy feature is turned on.
A simple test to verify this:
run ip xfrm mon on one window and add then delete a policy on another
window ..
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Acked-by: Masahide NAKAMURA <nakam@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
David L Stevens [Sun, 19 Nov 2006 18:38:39 +0000 (10:38 -0800)]
[IGMP]: Fix IGMPV3_EXP() normalization bit shift value.
The IGMPV3_EXP() macro doesn't correctly shift the normalization bit, so
time-out values are longer than they should be.
Thanks to Dirk Ooms for finding the problem in IGMPv3 - MLDv2 had a
similar problem that was already fixed a year ago. :-(
Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Marcel Holtmann [Sat, 18 Nov 2006 21:15:20 +0000 (22:15 +0100)]
[Bluetooth] Ignore L2CAP config requests on disconnect
Any L2CAP connection in disconnecting state shall not response
to any further config requests from the remote side. So in case
such a request is received, ignore it.
Signed-off-by: Ville Tervo <ville.tervo@nokia.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Marcel Holtmann [Sat, 18 Nov 2006 21:15:00 +0000 (22:15 +0100)]
[Bluetooth] Always include MTU in L2CAP config responses
When sending a positive config response it shall include the actual
MTU to be used on this channel. This differs from the Bluetooth 1.1
specification where it was enough to acknowledge the config request.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Marcel Holtmann [Sat, 18 Nov 2006 21:14:42 +0000 (22:14 +0100)]
[Bluetooth] Check if RFCOMM session is still attached to the TTY
If the RFCOMM session is no longer attached to the TTY device, then it
makes no sense to go through with changing the termios settings.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Marcel Holtmann [Sat, 18 Nov 2006 21:14:22 +0000 (22:14 +0100)]
[Bluetooth] Handling pending connect attempts after inquiry
After an inquiry completed or got canceled the Bluetooth core should
check for any pending connect attempts.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Marcel Holtmann [Sat, 18 Nov 2006 21:14:05 +0000 (22:14 +0100)]
[Bluetooth] Attach low-level connections to the Bluetooth bus
To receive uvents for the low-level ACL and SCO links, they must be
assigned to a subsystem. It is enough to attach them to the already
established Bluetooth bus.
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Yasuyuki Kozakai [Mon, 6 Nov 2006 18:06:23 +0000 (10:06 -0800)]
[IPV6] IP6TUNNEL: Add missing nf_reset() on input path.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Yasuyuki Kozakai [Mon, 6 Nov 2006 18:06:22 +0000 (10:06 -0800)]
[IPV6] IP6TUNNEL: Delete all tunnel device when unloading module.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
YOSHIFUJI Hideaki [Mon, 6 Nov 2006 17:45:45 +0000 (09:45 -0800)]
[IPV6] ROUTE: Do not enable router reachability probing in router mode.
RFC4191 explicitly states that the procedures are applicable to
hosts only. We should not have changed behavior of routers.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
YOSHIFUJI Hideaki [Mon, 6 Nov 2006 17:45:45 +0000 (09:45 -0800)]
[IPV6] ROUTE: Prefer reachable nexthop only if the caller requests.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
YOSHIFUJI Hideaki [Mon, 6 Nov 2006 17:45:44 +0000 (09:45 -0800)]
[IPV6] ROUTE: Try to use router which is not known unreachable.
Only routers in "FAILED" state should be considered unreachable.
Otherwise, we do not try to use speicific routes unless all least specific
routers are considered unreachable.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Dave Jones [Tue, 21 Nov 2006 21:58:59 +0000 (16:58 -0500)]
[PATCH] Fix CPU_FREQ_GOV_ONDEMAND=y compile error
The ONDEMAND governor needs FREQ_TABLE
Signed-off-by: Mattia Dongili <malattia@linux.it>
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Tue, 21 Nov 2006 16:07:38 +0000 (08:07 -0800)]
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
[PATCH] x86_64: Align data segment to PAGE_SIZE boundary
[PATCH] x86-64: increase PHB1 split transaction timeout
[PATCH] x86-64: Fix C3 timer test
Vivek Goyal [Mon, 20 Nov 2006 16:29:09 +0000 (11:29 -0500)]
[PATCH] x86_64: Align data segment to PAGE_SIZE boundary
o Explicitly align data segment to PAGE_SIZE boundary otherwise depending on
config options and tool chain it might be placed on a non PAGE_SIZE aligned
boundary and vmlinux loaders like kexec fail when they encounter a
PT_LOAD type segment which is not aligned to PAGE_SIZE boundary.
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Andi Kleen [Tue, 21 Nov 2006 09:22:09 +0000 (10:22 +0100)]
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
David Chinner [Tue, 21 Nov 2006 07:55:33 +0000 (18:55 +1100)]
[XFS] Stale the correct inode when freeing clusters.
SGI-PV: 958376
SGI-Modid: xfs-linux-melb:xfs-kern:27503a
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Lachlan McIlroy [Tue, 21 Nov 2006 07:55:16 +0000 (18:55 +1100)]
[XFS] Fix uninitialized br_state and br_startoff in
xfs_bmap_add_extent_delay_real()
SGI-PV: 957008
SGI-Modid: xfs-linux-melb:xfs-kern:27457a
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Signed-off-by: Shailendra Tripathi <stripathi@agami.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Bryan O'Sullivan [Mon, 20 Nov 2006 18:54:34 +0000 (10:54 -0800)]
IB/ipath: Depend on CONFIG_NET
ipath uses skb functions and won't build without CONFIG_NET.
Spotted by Randy Dunlap.
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Linus Torvalds [Mon, 20 Nov 2006 19:47:18 +0000 (11:47 -0800)]
Add "pure_initcall" for static variable initialization
This is a quick hack to overcome the fact that SRCU currently does not
allow static initializers, and we need to sometimes initialize those
things before any other initializers (even "core" ones) can do so.
Currently we don't allow this at all for modules, and the only user that
needs is right now is cpufreq. As reported by Thomas Gleixner:
"Commit
b4dfdbb3c707474a2254c5b4d7e62be31a4b7da9 ("[PATCH] cpufreq:
make the transition_notifier chain use SRCU breaks cpu frequency
notification users, which register the callback > on core_init
level."
Cc: Thomas Gleixner <tglx@timesys.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: Andrew Morton <akpm@osdl.org>,
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Mon, 20 Nov 2006 18:48:23 +0000 (10:48 -0800)]
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
IPoIB: Clear high octet in QP number
Greg Ungerer [Mon, 20 Nov 2006 05:46:22 +0000 (15:46 +1000)]
[PATCH] m68knommu: fix up for the irq_handler_t changes
Switch to using irq_handler_t for interrupt function handler pointers.
Change name of m68knommu's irq_hanlder_t data structure so it doesn't
clash with the common type (include/linux/interrupt.h).
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Toralf Foerster [Sun, 19 Nov 2006 06:19:41 +0000 (22:19 -0800)]
[PATCH] fix build error for HISAX_NETJET
Fix a build error for the enter:now PCI card.
Signed-off-by: Toralf Foerster <toralf.foerster@gmx.de>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Randy Dunlap [Sun, 19 Nov 2006 06:19:41 +0000 (22:19 -0800)]
[PATCH] ftape: fix printk format warnings
Fix printk format warnings:
drivers/char/ftape/zftape/zftape-buffers.c:87: warning: format '%d' expects type
'int', but argument 3 has type 'size_t'
drivers/char/ftape/zftape/zftape-buffers.c:104: warning: format '%d' expects type
'int', but argument 3 has type 'size_t'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Yasunori Goto [Sun, 19 Nov 2006 06:19:40 +0000 (22:19 -0800)]
[PATCH] x86_64: fix memory hotplug build with NUMA=n
This is to fix compile error of x86-64 memory hotplug without any NUMA
option.
CC arch/x86_64/mm/init.o
arch/x86_64/mm/init.c:501: error: redefinition of 'memory_add_physaddr_to_nid'
include/linux/memory_hotplug.h:71: error: previous definition of 'memory_add_phys
addr_to_nid' was here
arch/x86_64/mm/init.c:509: error: redefinition of 'memory_add_physaddr_to_nid'
arch/x86_64/mm/init.c:501: error: previous definition of 'memory_add_physaddr_to_
nid' was here
I confirmed compile completion with !NUMA, (NUMA & !ACPI_NUMA),
or (NUMA & ACPI_NUMA).
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Acked-by: Andi Kleen <ak@suse.de>
Cc: "Randy.Dunlap" <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jeff Garzik [Sun, 19 Nov 2006 06:19:39 +0000 (22:19 -0800)]
[PATCH] scx200_acb: handle PCI errors
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alexey Dobriyan [Sun, 19 Nov 2006 06:19:36 +0000 (22:19 -0800)]
[PATCH] i2c-ixp4xx: fix ") != 0))" typo
i2c_bit_add_bus() returns -E;
-E != 0 => err = 1
probe fails with positive error code
Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org>
Cc: Deepak Saxena <dsaxena@mvista.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Daniel Ritz [Sun, 19 Nov 2006 06:19:34 +0000 (22:19 -0800)]
[PATCH] pcmcia: fix 'rmmod pcmcia' with unbound devices
Having unbound PCMCIA devices: doing a 'find /sys' after a 'rmmod pcmcia'
gives an oops because the pcmcia_device is not unregisterd from the driver
core.
fixes bugzilla #7481
Signed-off-by: Daniel Ritz <daniel.ritz@gmx.ch>
Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Pavol Gono <Palo.Gono@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Yoichi Yuasa [Fri, 17 Nov 2006 00:51:41 +0000 (11:51 +1100)]
[CRYPTO] api: Remove one too many semicolon
This patch has removed one too many semicolon in crypto.h.
Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Linus Torvalds [Sat, 18 Nov 2006 03:55:11 +0000 (19:55 -0800)]
Merge branch 'fixes4linus' of git://git./linux/kernel/git/jbglaw/vax-linux
* 'fixes4linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbglaw/vax-linux:
lkkbd: Remove my old snail-mail address
David Weinehall [Sat, 18 Nov 2006 02:58:58 +0000 (03:58 +0100)]
[PATCH] Update my CREDITS entry
I moved from Sweden to Finland 2.5 years ago, thought it might be time
to update my CREDITS entry (simply removing the address completely
seemed the sanest option).
Signed-off-by: David Weinehall <tao@kernel.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Sat, 18 Nov 2006 03:31:09 +0000 (19:31 -0800)]
Revert "ACPI: created a dedicated workqueue for notify() execution"
This reverts commit
37605a6900f6b4d886d995751fcfeef88c4e462c.
Again.
This same bug has now been introduced twice: it was done earlier by
commit
b8d35192c55fb055792ff0641408eaaec7c88988, only to be reverted
last time in commit
72945b2b90a5554975b8f72673ab7139d232a121.
We must NOT try to queue up notify handlers to another thread than the
normal ACPI execution thread, because the notifications on some systems
seem to just keep on accumulating until we run out of memory and/or
threads.
Keeping events within the one deferred execution thread automatically
throttles the events properly.
At least the Compaq N620c will lock up completely on the first thermal
event without this patch reverted.
Cc: David Brownell <david-b@pacbell.net>
Cc: Len Brown <len.brown@intel.com>
Cc: Alexey Starikovskiy <alexey.y.starikovskiy@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Fri, 17 Nov 2006 19:14:56 +0000 (11:14 -0800)]
x86: be more careful when walking back the frame pointer chain
When showing the stack backtrace, make sure that we never accept not
only an unchanging frame pointer, but also a frame pointer that moves
back down the stack frame. It must always grow up (toward older stack
frames).
I doubt this has triggered, but a subtly corrupt stack with extremely
unlucky contents could cause us to loop forever on a bogus endless frame
pointer chain.
This review was triggered by much worse problems happening in some of
the other stack unwinding code.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ingo Molnar [Fri, 17 Nov 2006 18:57:22 +0000 (19:57 +0100)]
[PATCH] lockdep: fix static keys in module-allocated percpu areas
lockdep got confused by certain locks in modules:
INFO: trying to register non-static key.
the code is fine but needs lockdep annotation.
turning off the locking correctness validator.
Call Trace:
[<
ffffffff8026f40d>] dump_trace+0xaa/0x3f2
[<
ffffffff8026f78f>] show_trace+0x3a/0x60
[<
ffffffff8026f9d1>] dump_stack+0x15/0x17
[<
ffffffff802abfe8>] __lock_acquire+0x724/0x9bb
[<
ffffffff802ac52b>] lock_acquire+0x4d/0x67
[<
ffffffff80267139>] rt_spin_lock+0x3d/0x41
[<
ffffffff8839ed3f>] :ip_conntrack:__ip_ct_refresh_acct+0x131/0x174
[<
ffffffff883a1334>] :ip_conntrack:udp_packet+0xbf/0xcf
[<
ffffffff8839f9af>] :ip_conntrack:ip_conntrack_in+0x394/0x4a7
[<
ffffffff8023551f>] nf_iterate+0x41/0x7f
[<
ffffffff8025946a>] nf_hook_slow+0x64/0xd5
[<
ffffffff802369a2>] ip_rcv+0x24e/0x506
[...]
Steven Rostedt found the bug: static_obj() check did not take
PERCPU_ENOUGH_ROOM into account, so in-module DEFINE_PER_CPU-area locks
were triggering this message.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ingo Molnar [Fri, 17 Nov 2006 13:26:18 +0000 (14:26 +0100)]
[PATCH] i386/x86_64: ACPI cpu_idle_wait() fix
The scheduler on Andreas Friedrich's hyperthreading system stopped
working properly: the scheduler would never move tasks to another CPU!
The lask known working kernel was 2.6.8.
After a couple of attempts to corner the bug, the following smoking gun
was found:
BIOS reported wrong ACPI idfor the processor
CPU#1: set_cpus_allowed(), swapper:1, 3 -> 2
[<
c0103bbe>] show_trace_log_lvl+0x34/0x4a
[<
c0103ceb>] show_trace+0x2c/0x2e
[<
c01045f8>] dump_stack+0x2b/0x2d
[<
c0116a77>] set_cpus_allowed+0x52/0xec
[<
c0101d86>] cpu_idle_wait+0x2e/0x100
[<
c0259c57>] acpi_processor_power_exit+0x45/0x58
[<
c0259752>] acpi_processor_remove+0x46/0xea
[<
c025c6fb>] acpi_start_single_object+0x47/0x54
[<
c025cee5>] acpi_bus_register_driver+0xa4/0xd3
[<
c04ab2d7>] acpi_processor_init+0x57/0x77
[<
c01004d7>] init+0x146/0x2fd
[<
c0103a87>] kernel_thread_helper+0x7/0x10
a quick look at cpu_idle_wait() shows how broken that code is
on i386: it changes the init task's affinity map but never
restores it ...
and because all userspace tasks get forked by init, they all
inherited that single-CPU affinity mask. x86_64 cloned this
bug too.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Andreas Friedrich <andreas.friedrich@fujitsu-siemens.com>
Cc: Wolfgang Erig <Wolfgang.Erig@fujitsu-siemens.com>
Cc: Andrew Morton <akpm@osdl.org>
Cc: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Ingo Molnar [Fri, 17 Nov 2006 04:57:49 +0000 (05:57 +0100)]
[PATCH] x86_64: stack unwinder crash fix
the new dwarf2 unwinder crashes while trying to dump the stack:
Leftover inexact backtrace:
Unable to handle kernel paging request at
ffffffff82800000 RIP:
[<
ffffffff8026cf26>] dump_trace+0x35b/0x3d2
PGD 203027 PUD 205027 PMD 0
Oops: 0000 [2] PREEMPT SMP
CPU 0
Modules linked in:
Pid: 30, comm: khelper Not tainted 2.6.19-rc6-rt1 #11
RIP: 0010:[<
ffffffff8026cf26>] [<
ffffffff8026cf26>] dump_trace+0x35b/0x3d2
RSP: 0000:
ffff81003fb9d848 EFLAGS:
00010006
RAX:
0000000000000000 RBX:
0000000000000000 RCX:
0000000000000000
RDX:
0000000000000000 RSI:
ffffffff805b3520 RDI:
0000000000000000
RBP:
ffffffff827ffff9 R08:
ffffffff80aad000 R09:
0000000000000005
R10:
ffffffff80aae000 R11:
ffffffff8037961b R12:
ffff81003fb9d858
R13:
0000000000000000 R14:
ffffffff80598460 R15:
ffffffff80ab1fc0
FS:
0000000000000000(0000) GS:
ffffffff806c4200(0000) knlGS:
0000000000000000
CS: 0010 DS: 0018 ES: 0018 CR0:
000000008005003b
CR2:
ffffffff82800000 CR3:
0000000000201000 CR4:
00000000000006e0
this crash happened because it did not sanitize the dwarf2 data it
got, and got an unaligned stack pointer - which happily walked past
the process stack (and eventually reached the end of kernel memory
and pagefaulted there) due to this naive iteration condition:
HANDLE_STACK (((long) stack & (THREAD_SIZE-1)) != 0);
note that i386 is alot more conservative when it comes to trusting
stack pointers:
static inline int valid_stack_ptr(struct thread_info *tinfo, void *p)
{
return p > (void *)tinfo &&
p < (void *)tinfo + THREAD_SIZE - 3;
}
but the x86_64 code did not take this bit of i386 code.
The fix is to align the stack pointer.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Andi Kleen <ak@suse.de>
Cc: Jan Beulich <jbeulich@novell.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Jan-Benedict Glaw [Fri, 17 Nov 2006 09:32:04 +0000 (10:32 +0100)]
lkkbd: Remove my old snail-mail address
I moved to a different town and my old snail-mail address is invalid
now. Also, there's no need at all to have any address like that in
the sources, so remove it completely.
Signed-off-by: Jan-Benedict Glaw <jbglaw@lug-owl.de>
Linus Torvalds [Fri, 17 Nov 2006 06:18:28 +0000 (22:18 -0800)]
Fix generic fb_ddc i2c edid probe msg
Benh points out that the msgs[0].flags entry never got initialized, and
since it's an automatic stack allocation, it could have any random
value, which is bad.
Rewrite the initializer to explicitly initialize all fields of the small
i2c_msg structure array we generate. Just to keep it all obvious, let's
handle msgs[1].buf in the same initializer while we're at it, instead of
initializing that one separately later.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Benjamin Herrenschmidt [Fri, 17 Nov 2006 04:35:00 +0000 (15:35 +1100)]
[PATCH] Fix radeon DDC regression
When radeonfb was changed to use the new "generic" ddc, a bit of
code initializing the GPIO lines was lost, causing it to not work
if the firmware didn't configure them properly, which seems to
happen on some cards.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Linus Torvalds [Fri, 17 Nov 2006 00:40:04 +0000 (16:40 -0800)]
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
aoe: Add forgotten NULL at end of attribute list in aoeblk.c
debugfs: check return value correctly
W1: ioremap balanced with iounmap
Linus Torvalds [Fri, 17 Nov 2006 00:39:46 +0000 (16:39 -0800)]
Merge /pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: auerswald possible memleak fix
USB: ipaq: Add HTC Modem Support
USB: Fixed outdated usb_get_device_descriptor() documentation
usb-storage: Remove duplicated unusual_devs.h entries for Sony Ericsson P990i
USB: hid-core: Add quirk for new Apple keyboard/trackpad
USB Storage: unusual_devs.h entry for Sony Ericsson P990i
USB: correct keymapping on Powerbook built-in USB ISO keyboards
USB: OHCI: fix root-hub resume bug
USB: Fix UCR-61S2B unusual_dev entry
USB: ftdi driver pid for dmx-interfaces
USB: ftdi_sio: adds vendor/product id for a RFID construction kit
OHCI: disallow autostop when wakeup is not available
Dennis Stosberg [Mon, 13 Nov 2006 08:15:20 +0000 (09:15 +0100)]
aoe: Add forgotten NULL at end of attribute list in aoeblk.c
This caused the system to stall when the aoe module was loaded. The
error was introduced in commit
4ca5224f3ea4779054d96e885ca9b3980801ce13
Signed-off-by: Dennis Stosberg <dennis@stosberg.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Akinobu Mita [Thu, 19 Oct 2006 03:24:42 +0000 (12:24 +0900)]
debugfs: check return value correctly
The return value is stored in "*dentry", not in "dentry".
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Amol Lad [Thu, 5 Oct 2006 10:26:02 +0000 (14:26 +0400)]
W1: ioremap balanced with iounmap
ioremap must be balanced with iounmap in error path.
Please consider for 2.6.19.
Signed-off-by: Amol Lad <amol@verismonetworks.com>
Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Mariusz Kozlowski [Mon, 6 Nov 2006 23:31:51 +0000 (00:31 +0100)]
USB: auerswald possible memleak fix
fix possible memory leak in auerbuf_setup().
Regards,
Mariusz Kozlowski
Signed-off-by: Mariusz Kozlowski <m.kozlowski@tuxland.pl>
Signed-off-by: Wolfgang Muees <wolfgang@iksw-muees.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alex Sanks [Mon, 30 Oct 2006 00:38:31 +0000 (16:38 -0800)]
USB: ipaq: Add HTC Modem Support
Adds support for HTC Smart Phones in modem mode (as opposed to sync
mode). Loads and works with pppd on my T-Mobile SDA.
Signed-off-by: Alex Sanks <alex@sanks.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Laurent Pinchart [Tue, 7 Nov 2006 09:16:25 +0000 (10:16 +0100)]
USB: Fixed outdated usb_get_device_descriptor() documentation
usb_get_device_descriptor() used to convert several descriptor fields to host
CPU's byte order. Now that it doesn't convert them anymore, update the
documentation to reflect this.
Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Sergey Vlasov [Mon, 6 Nov 2006 13:33:07 +0000 (16:33 +0300)]
usb-storage: Remove duplicated unusual_devs.h entries for Sony Ericsson P990i
For some reason the unusual_devs.h entry for Sony Ericsson P990i had
three identical copies in a wrong place in the file in addition to the
correct entry.
Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Julien BLACHE [Sun, 12 Nov 2006 10:22:42 +0000 (11:22 +0100)]
USB: hid-core: Add quirk for new Apple keyboard/trackpad
The new Core2 Duo MacBook Pro have a new keyboard+trackpad device.
The following patch adds the needed HID quirk for the Fn key.
Signed-off-by: Julien BLACHE <jb@jblache.org>
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Jan Mate [Thu, 9 Nov 2006 03:58:04 +0000 (19:58 -0800)]
USB Storage: unusual_devs.h entry for Sony Ericsson P990i
USB Storage: this patch adds support for Sony Ericsson P990i
Signed-off-by: Jan Mate <mate@fiit.stuba.sk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Olaf Hering [Thu, 9 Nov 2006 03:58:07 +0000 (19:58 -0800)]
USB: correct keymapping on Powerbook built-in USB ISO keyboards
similar to the version in adbhid_input_register(): The '<>' key and the
'^°' key on a german keyboard is swapped. Provide correct keys to
userland, external USB keyboards will not work correctly when the
'badmap'/'goodmap' workarounds from xkeyboard-config are used.
It is expected that distributions drop the badmap/goodmap part from
keycodes/macintosh in the xkeyboard-config package.
This is probably 2.6.18.x material, if major distros settle on 2.6.18.
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Dmitry Torokhov <dtor@mail.ru>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Stern [Tue, 24 Oct 2006 16:04:22 +0000 (12:04 -0400)]
USB: OHCI: fix root-hub resume bug
When a suspended OHCI controller sees a port's status change, it sets
both the Root-Hub-Status-Change and the Resume-Detect bits in the
Interrupt Status register. Processing both these bits, the driver
tries to resume the root hub twice!
This patch (as807) fixes the bug by ignoring RD if RHSC is set. It
also prints a slightly more informative log message when a
remote-wakeup event occurs.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Phil Dibowitz [Fri, 3 Nov 2006 07:14:10 +0000 (23:14 -0800)]
USB: Fix UCR-61S2B unusual_dev entry
Recently this entry's bcd scope was narrowed so as not to falsly apply
to bcd's other than 0x0110. But while it breaks those of a larger bcd,
it is still needed for those of a smaller bcd - so this changes the
lower bcd limit to 0x0000.
Signed-off-by: Phil Dibowitz <phil@ipom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Frank Sievertsen [Fri, 20 Oct 2006 07:43:53 +0000 (09:43 +0200)]
USB: ftdi driver pid for dmx-interfaces
Please add a usb pid to the ftdi_sio driver. The pid is used by dmx4all
dmx-interfaces (for stage lighting).
The interfaces are using the usb-id 0403:c850. I added the id to the driver
and it works perfectly. I added a patch for linux 2.6.18.1, too.
From: Frank Sievertsen <frank@sievertsen.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Kjell Myksvoll [Sun, 22 Oct 2006 21:26:42 +0000 (23:26 +0200)]
USB: ftdi_sio: adds vendor/product id for a RFID construction kit
Adds the vendor and prodcut id for a RFID construction kit from the
Elektor Electronics magazine, september 2006.
From: Kjell Myksvoll <kmyksvo@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alan Stern [Tue, 14 Nov 2006 21:28:01 +0000 (16:28 -0500)]
OHCI: disallow autostop when wakeup is not available
This patch (as822) prevents the OHCI autostop mechanism from kicking in
if the root hub is not able or not allowed to issue wakeup requests.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Ingo Molnar [Thu, 16 Nov 2006 10:49:16 +0000 (11:49 +0100)]
[PATCH] x86_64: fix CONFIG_CC_STACKPROTECTOR build bug
on x86_64, the CONFIG_CC_STACKPROTECTOR build fails if used in a
distcc setup that has "CC" defined to "distcc gcc":
gcc: gcc: linker input file unused because linking not done
gcc: gcc: linker input file unused because linking not done
gcc: gcc: linker input file unused because linking not done
this is because the gcc-x86_64-has-stack-protector.sh script
has a 2-parameters assumption. Fix this by passing $(CC) as
a single parameter.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Please-Use-Me-More: make randconfig
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Andi Kleen [Thu, 16 Nov 2006 09:22:03 +0000 (10:22 +0100)]
[PATCH] x86-64: Fix vsyscall.c compilation on UP
Broken by earlier patch by me.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael S. Tsirkin [Thu, 16 Nov 2006 08:59:12 +0000 (10:59 +0200)]
IPoIB: Clear high octet in QP number
IPoIB assumes that high (reserved) octet in the hardware address is 0,
and copies it into the QPN. This violates RFC 4391 (which requires
that the high 8 bits are ignored on receive), and will result in an
invalid QPN being used when interoperating with IPoIB connected mode.
Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Linus Torvalds [Thu, 16 Nov 2006 20:22:52 +0000 (12:22 -0800)]
Merge branch 'for-linus' of /home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] Remove OP_MAX_COUNTER
[ARM] Remove PM_LEGACY=y from selected ARM defconfigs
[ARM] 3857/2: pnx4008: add devices' registration
Linus Torvalds [Thu, 16 Nov 2006 19:48:01 +0000 (11:48 -0800)]
Merge /linux/kernel/git/jejb/scsi-rc-fixes-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] psi240i.c: fix an array overrun
[SCSI] gdth: Fix && typos
[SCSI] iscsi class: update version
[SCSI] iscsi_tcp: fix xmittask oops
[SCSI] iscsi: add newlines to debug messages
[SCSI] iscsi: always release crypto
[SCSI] sg: fix incorrect last scatg length
[SCSI] 3ware 9000 add support for 9650SE
[SCSI] aic94xx SCSI timeout fix: SMP retry fix.
[SCSI] aic94xx SCSI timeout fix
Linus Torvalds [Thu, 16 Nov 2006 19:45:23 +0000 (11:45 -0800)]
Merge /pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[TG3]: Disable TSO on 5906 if CLKREQ is enabled.
[TCP]: Fix up sysctl_tcp_mem initialization.
[NETFILTER]: ip6_tables: use correct nexthdr value in ipv6_find_hdr()
[NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt
[NETFILTER]: Use pskb_trim in {ip,ip6,nfnetlink}_queue
[NETFILTER]: nfnetlink_log: fix byteorder of NFULA_SEQ_GLOBAL
[TG3]: Increase 5906 firmware poll time.
Linus Torvalds [Thu, 16 Nov 2006 19:44:38 +0000 (11:44 -0800)]
Merge branch 'release' of /linux/kernel/git/aegl/linux-2.6
* 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] a fix towards allmodconfig build
[IA64] use generic_handle_irq()
[IA64] typename -> name conversion
[IA64] irqs: use `name' not `typename'
[IA64] bte_unaligned_copy() transfers one extra cache line.
Tejun Heo [Thu, 16 Nov 2006 09:19:31 +0000 (01:19 -0800)]
[PATCH] scsi: clear garbage after CDBs on SG_IO
ATAPI devices transfer fixed number of bytes for CDBs (12 or 16). Some
ATAPI devices choke when shorter CDB is used and the left bytes contain
garbage. Block SG_IO cleared left bytes but SCSI SG_IO didn't. This patch
makes SCSI SG_IO clear it and simplify CDB clearing in block SG_IO.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Cc: Mathieu Fluhr <mfluhr@nero.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: Douglas Gilbert <dougg@torque.net>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Cc: <stable@kernel.org>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Halcrow [Thu, 16 Nov 2006 09:19:30 +0000 (01:19 -0800)]
[PATCH] eCryptfs: CIFS nlink fixes
When CIFS is the lower filesystem, the old lower dentry needs to be explicitly
dropped from inside eCryptfs to force a revalidate. In addition, when CIFS is
the lower filesystem, the inode attributes need to be copied back up from the
lower inode to the eCryptfs inode on an eCryptfs revalidate.
Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
OGAWA Hirofumi [Thu, 16 Nov 2006 09:19:29 +0000 (01:19 -0800)]
[PATCH] Fix strange size check in __get_vm_area_node()
Recently, __get_vm_area_node() was changed like following
if (unlikely(!area))
return NULL;
- if (unlikely(!size)) {
- kfree (area);
+ if (unlikely(!size))
return NULL;
- }
It is leaking `area', also original code seems strange already.
Probably, we wanted to do this patch.
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
OGAWA Hirofumi [Thu, 16 Nov 2006 09:19:28 +0000 (01:19 -0800)]
[PATCH] fat: add fat_getattr()
This adds fat_getattr() for setting stat->blksize. (FAT uses the size
of cluster for proper I/O)
Signed-off-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alexey Dobriyan [Thu, 16 Nov 2006 09:19:28 +0000 (01:19 -0800)]
[PATCH] Don't give bad kprobes example aka ") < 0))" typo
Signed-off-by: Alexey Dobriyan <adobriyan@openvz.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
David Howells [Thu, 16 Nov 2006 09:19:27 +0000 (01:19 -0800)]
[PATCH] AFS: Amend the AFS configuration options
Amend the text of AFS configuration options.
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Akinobu Mita [Thu, 16 Nov 2006 09:19:25 +0000 (01:19 -0800)]
[PATCH] dell_rbu: fix error check
platform_device_register_simple() returns error code as pointer when it
fails. The return value should be checked by IS_ERR().
Cc: Abhay Salunke <abhay_salunke@dell.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Phillip Susi [Thu, 16 Nov 2006 09:19:23 +0000 (01:19 -0800)]
[PATCH] Update udf documentation to reflect current state of read/write support
Change Documentation/filesystems/udf.txt from saying that read/write mounts
on cd media are not supported to instead state the current level of
support. Specifically that it works fine on dvd+rw media and can be made
to work on cd-rw media via the pktcdvd device.
Cc: Peter Osterlund <petero2@telia.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Eric Sandeen [Thu, 16 Nov 2006 09:19:22 +0000 (01:19 -0800)]
[PATCH] hfs_fill_super returns success even if no root inode
http://kernelfun.blogspot.com/2006/11/mokb-14-11-2006-linux-26x-selinux.html
mount that image...
fs: filesystem was not cleanly unmounted, running fsck.hfs is recommended. mounting read-only.
hfs: get root inode failed.
BUG: unable to handle kernel NULL pointer dereference at virtual address
00000018
printing eip
...
EIP is at superblock_doinit+0x21/0x767
...
[] selinux_sb_kern_mount+0xc/0x4b
[] vfs_kern_mount+0x99/0xf6
[] do_kern_mount+0x2d/0x3e
[] do_mount+0x5fa/0x66d
[] sys_mount+0x77/0xae
[] syscall_call+0x7/0xb
DWARF2 unwinder stuck at syscall_call+0x7/0xb
hfs_fill_super() returns success even if
root_inode = hfs_iget(sb, &fd.search_key->cat, &rec);
or
sb->s_root = d_alloc_root(root_inode);
fails. This superblock finds its way to superblock_doinit() which does:
struct dentry *root = sb->s_root;
struct inode *inode = root->d_inode;
and boom. Need to make sure the error cases return an error, I think.
[akpm@osdl.org: return -ENOMEM on oom]
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Arnaud Giersch [Thu, 16 Nov 2006 09:19:21 +0000 (01:19 -0800)]
[PATCH] parport: fix compilation failure
Fix compilation failure.
Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Bryan O'Sullivan [Thu, 16 Nov 2006 09:19:19 +0000 (01:19 -0800)]
[PATCH] IB/ipath - fix driver build for platforms with PCI, but not HT
The PCI Express and Hypertransport chip-specific source files should only
be built when the kernel has the capability of actually compiling them.
This fixes the driver build on, for example, ia64.
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Olaf Hering [Thu, 16 Nov 2006 09:19:17 +0000 (01:19 -0800)]
[PATCH] set default video mode on PowerBook Wallstreet
Finally add the third PowerBook Wallstreet 233MHz model to the list of
known display resolutions.
Without this change, a 640x480 video mode is used. A workaround so far was
to boot with 'video=atyfb:vmode:14'
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Cc: Solomon Peachy <pizza@shaftnet.org>
Cc: James Simmons <jsimmons@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Michael Halcrow [Thu, 16 Nov 2006 09:19:16 +0000 (01:19 -0800)]
[PATCH] eCryptfs: dput() lower d_parent on rename
On rename, for both the old and new lower dentry objects, eCryptfs is
missing a dput on the lower parent directory dentry. This patch will
prevent the BUG() at fs/dcache.c:613 from being hit after renaming a file
inside eCryptfs and then doing a umount on the lower filesystem.
Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Vitaly Wool [Thu, 16 Nov 2006 09:19:14 +0000 (01:19 -0800)]
[PATCH] pnx4008:fix NULL dereference in rgbfb
Fix possible NULL dereference in pnxrgbfb.
Signed-off-by: Vitaly Wool <vwool@ru.mvista.com>
Cc: James Simmons <jsimmons@infradead.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Vitaly Wool [Thu, 16 Nov 2006 09:19:11 +0000 (01:19 -0800)]
[PATCH] pnx4008: rename driver
Make the drivers' names less generic to avoid possible confusion in future,
as was requested by Russell King.
Signed-off-by: Vitaly Wool <vwool@ru.mvista.com>
Acked-by: James Simmons <jsimmons@infradead.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Zhang, Yanmin [Thu, 16 Nov 2006 09:19:10 +0000 (01:19 -0800)]
[PATCH] some irq_chip variables point to NULL
I got an oops when booting 2.6.19-rc5-mm1 on my ia64 machine.
Below is the log.
Oops
11012296146944 [1]
Modules linked in: binfmt_misc dm_mirror dm_multipath dm_mod thermal processor f
an container button sg eepro100 e100 mii
Pid: 0, CPU 0, comm: swapper
psr :
0000121008022038 ifs :
800000000000040b ip : [<
a0000001000e1411>] Not
tainted
ip is at __do_IRQ+0x371/0x3e0
unat:
0000000000000000 pfs :
000000000000040b rsc :
0000000000000003
rnat:
656960155aa56aa5 bsps:
a00000010058b890 pr :
656960155aa55a65
ldrs:
0000000000000000 ccv :
0000000000000000 fpsr:
0009804c0270033f
csd :
0000000000000000 ssd :
0000000000000000
b0 :
a0000001000e1390 b6 :
a0000001005beac0 b7 :
e00000007f01aa00
f6 :
000000000000000000000 f7 :
0ffe69090000000000000
f8 :
1000a9090000000000000 f9 :
0ffff8000000000000000
f10 :
1000a908ffffff6f70000 f11 :
1003e0000000000000909
r1 :
a000000100fbbff0 r2 :
0000000000010002 r3 :
0000000000010001
r8 :
fffffffffffbffff r9 :
a000000100bd8060 r10 :
a000000100dd83b8
r11 :
fffffffffffeffff r12 :
a000000100bcbbb0 r13 :
a000000100bc4000
r14 :
0000000000010000 r15 :
0000000000010000 r16 :
a000000100c01aa8
r17 :
a000000100d2c350 r18 :
0000000000000000 r19 :
a000000100d2c300
r20 :
a000000100c01a88 r21 :
0000000080010100 r22 :
a000000100c01ac0
r23 :
a0000001000108e0 r24 :
e000000477980004 r25 :
0000000000000000
r26 :
0000000000000000 r27 :
e00000000913400c r28 :
e0000004799ee51c
r29 :
e0000004778b87f0 r30 :
a000000100d2c300 r31 :
a00000010005c7e0
Call Trace:
[<
a000000100014600>] show_stack+0x40/0xa0
sp=
a000000100bcb760 bsp=
a000000100bc4f40
[<
a000000100014f00>] show_regs+0x840/0x880
sp=
a000000100bcb930 bsp=
a000000100bc4ee8
[<
a000000100037fb0>] die+0x250/0x320
sp=
a000000100bcb930 bsp=
a000000100bc4ea0
[<
a00000010005e5f0>] ia64_do_page_fault+0x8d0/0xa20
sp=
a000000100bcb950 bsp=
a000000100bc4e50
[<
a00000010000caa0>] ia64_leave_kernel+0x0/0x290
sp=
a000000100bcb9e0 bsp=
a000000100bc4e50
[<
a0000001000e1410>] __do_IRQ+0x370/0x3e0
sp=
a000000100bcbbb0 bsp=
a000000100bc4df0
[<
a000000100011f50>] ia64_handle_irq+0x170/0x220
sp=
a000000100bcbbb0 bsp=
a000000100bc4dc0
[<
a00000010000caa0>] ia64_leave_kernel+0x0/0x290
sp=
a000000100bcbbb0 bsp=
a000000100bc4dc0
[<
a000000100012390>] ia64_pal_call_static+0x90/0xc0
sp=
a000000100bcbd80 bsp=
a000000100bc4d78
[<
a000000100015630>] default_idle+0x90/0x160
sp=
a000000100bcbd80 bsp=
a000000100bc4d58
[<
a000000100014290>] cpu_idle+0x1f0/0x440
sp=
a000000100bcbe20 bsp=
a000000100bc4d18
[<
a000000100009980>] rest_init+0xc0/0xe0
sp=
a000000100bcbe20 bsp=
a000000100bc4d00
[<
a0000001009f8ea0>] start_kernel+0x6a0/0x6c0
sp=
a000000100bcbe20 bsp=
a000000100bc4ca0
[<
a0000001000089f0>] __end_ivt_text+0x6d0/0x6f0
sp=
a000000100bcbe30 bsp=
a000000100bc4c00
<0>Kernel panic - not syncing: Aiee, killing interrupt handler!
The root cause is that some irq_chip variables, especially ia64_msi_chip,
initiate their memeber end to point to NULL. __do_IRQ doesn't check
if irq_chip->end is null and just calls it after processing the interrupt.
As irq_chip->end is called at many places, so I fix it by reinitiating
irq_chip->end to dummy_irq_chip.end, e.g., a noop function.
Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Zhang, Yanmin [Thu, 16 Nov 2006 09:19:08 +0000 (01:19 -0800)]
[PATCH] ipmi: use platform_device_add() instead of platform_device_register() to register device allocated dynamically
I got below warning when running 2.6.19-rc5-mm1 on my ia64 machine.
WARNING at lib/kobject.c:172 kobject_init()
Call Trace:
[<
a0000001000137c0>] show_stack+0x40/0xa0
sp=
e0000002ff9f7bc0 bsp=
e0000002ff9f0d10
[<
a000000100013850>] dump_stack+0x30/0x60
sp=
e0000002ff9f7d90 bsp=
e0000002ff9f0cf8
[<
a000000100407bb0>] kobject_init+0x90/0x160
sp=
e0000002ff9f7d90 bsp=
e0000002ff9f0cd0
[<
a0000001005ae080>] device_initialize+0x40/0x1c0
sp=
e0000002ff9f7da0 bsp=
e0000002ff9f0cb0
[<
a0000001005b88c0>] platform_device_register+0x20/0x60
sp=
e0000002ff9f7dd0 bsp=
e0000002ff9f0c90
[<
a000000100592560>] try_smi_init+0xbc0/0x11e0
sp=
e0000002ff9f7dd0 bsp=
e0000002ff9f0c50
[<
a000000100594900>] init_ipmi_si+0xaa0/0x12e0
sp=
e0000002ff9f7de0 bsp=
e0000002ff9f0bd8
[<
a000000100009910>] init+0x350/0x780
sp=
e0000002ff9f7e00 bsp=
e0000002ff9f0ba8
[<
a000000100011d30>] kernel_thread_helper+0x30/0x60
sp=
e0000002ff9f7e30 bsp=
e0000002ff9f0b80
[<
a0000001000090c0>] start_kernel_thread+0x20/0x40
sp=
e0000002ff9f7e30 bsp=
e0000002ff9f0b80
WARNING at lib/kobject.c:172 kobject_init()
Call Trace:
[<
a0000001000137c0>] show_stack+0x40/0xa0
sp=
e0000002ff9f7b40 bsp=
e0000002ff9f0db0
[<
a000000100013850>] dump_stack+0x30/0x60
sp=
e0000002ff9f7d10 bsp=
e0000002ff9f0d98
[<
a000000100407bb0>] kobject_init+0x90/0x160
sp=
e0000002ff9f7d10 bsp=
e0000002ff9f0d70
[<
a0000001005ae080>] device_initialize+0x40/0x1c0
sp=
e0000002ff9f7d20 bsp=
e0000002ff9f0d50
[<
a0000001005b88c0>] platform_device_register+0x20/0x60
sp=
e0000002ff9f7d50 bsp=
e0000002ff9f0d30
[<
a00000010058ac00>] ipmi_register_smi+0xcc0/0x18e0
sp=
e0000002ff9f7d50 bsp=
e0000002ff9f0c90
[<
a000000100592600>] try_smi_init+0xc60/0x11e0
sp=
e0000002ff9f7dd0 bsp=
e0000002ff9f0c50
[<
a000000100594900>] init_ipmi_si+0xaa0/0x12e0
sp=
e0000002ff9f7de0 bsp=
e0000002ff9f0bd8
[<
a000000100009910>] init+0x350/0x780
sp=
e0000002ff9f7e00 bsp=
e0000002ff9f0ba8
[<
a000000100011d30>] kernel_thread_helper+0x30/0x60
sp=
e0000002ff9f7e30 bsp=
e0000002ff9f0b80
[<
a0000001000090c0>] start_kernel_thread+0x20/0x40
sp=
e0000002ff9f7e30 bsp=
e0000002ff9f0b80
The root cause is the device struct is initialized twice.
If the device is allocated dynamically by platform_device_alloc,
platform_device_alloc will initialize struct device, then,
platform_device_add should be used to register the device.
The difference between platform_device_register and platform_device_add is
platform_device_register will initiate the device while platform_device_add
won't.
Signed-off-by: Zhang Yanmin <yanmin.zhang@intel.com>
Cc: Corey Minyard <minyard@acm.org>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Luck, Tony [Thu, 16 Nov 2006 08:43:12 +0000 (00:43 -0800)]
[IA64] a fix towards allmodconfig build
The HP_SIMSCSI driver can't be built as a module (unhealthy dependencies on
things that shouldn't really be exported).
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Ingo Molnar [Thu, 16 Nov 2006 08:43:07 +0000 (00:43 -0800)]
[IA64] use generic_handle_irq()
Use generic_handle_irq() to handle mixed-type irq handling.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Ingo Molnar [Thu, 16 Nov 2006 08:43:02 +0000 (00:43 -0800)]
[IA64] typename -> name conversion
convert irq chip typename -> name.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Andrew Morton [Thu, 16 Nov 2006 08:42:58 +0000 (00:42 -0800)]
[IA64] irqs: use `name' not `typename'
`typename' is going away and is usually uninitialised anwyay.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Michael Chan [Thu, 16 Nov 2006 05:14:42 +0000 (21:14 -0800)]
[TG3]: Disable TSO on 5906 if CLKREQ is enabled.
Due to hardware errata, TSO must be disabled if the PCI Express clock
request is enabled on 5906. The chip may hang when transmitting TSO
frames if CLKREQ is enabled.
Update version to 3.69.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
John Heffner [Wed, 15 Nov 2006 04:25:17 +0000 (20:25 -0800)]
[TCP]: Fix up sysctl_tcp_mem initialization.
Fix up tcp_mem initial settings to take into account the size of the
hash entries (different on SMP and non-SMP systems).
Signed-off-by: John Heffner <jheffner@psc.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Patrick McHardy [Wed, 15 Nov 2006 03:49:13 +0000 (19:49 -0800)]
[NETFILTER]: ip6_tables: use correct nexthdr value in ipv6_find_hdr()
nexthdr is NEXTHDR_FRAGMENT, the nexthdr value from the fragment header
is hp->nexthdr.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Yasuyuki Kozakai [Wed, 15 Nov 2006 03:48:48 +0000 (19:48 -0800)]
[NETFILTER]: ip6_tables: fixed conflicted optname for getsockopt
66 and 67 for getsockopt on IPv6 socket is doubly used for IPv6 Advanced
API and ip6tables. This moves numbers for ip6tables to 68 and 69.
This also kills XT_SO_* because {ip,ip6,arp}_tables doesn't have so much
common numbers now.
The old userland tools keep to behave as ever, because old kernel always
calls functions of IPv6 Advanced API for their numbers.
Signed-off-by: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>