commit df7addbb45874f0f992266003155de5a22e1872f
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun Dec 18 16:36:54 2005 -0800
Linux v2.6.15-rc6
Also renamed in honor of Portland being snowed in and everybody sliding
around on the highways like greased pumpkins.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 27f4e0834746196f219e3e030ca71ffd3b176483
Author: Kyungmin Park <kyungmin.park@samsung.com>
Date: Fri Dec 16 11:17:29 2005 +0900
[PATCH] mtd onenand driver: use platform_device.h instead device.h
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 532a37cf8d05dd1aa5631be836036204b0d2b4a1
Author: Kyungmin Park <kyungmin.park@samsung.com>
Date: Fri Dec 16 11:17:29 2005 +0900
[PATCH] mtd onenand driver: reduce stack usage
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 20ba89a3614bbc5d111fd74375e14c577859b2a3
Author: Kyungmin Park <kyungmin.park@samsung.com>
Date: Fri Dec 16 11:17:29 2005 +0900
[PATCH] mtd onenand driver: fix unlock problem in DDP
commit 37b1cc3910f7976369fc0ed55068a686e92555e6
Author: Kyungmin Park <kyungmin.park@samsung.com>
Date: Fri Dec 16 11:17:29 2005 +0900
[PATCH] mtd onenand driver: check correct manufacturer
This (and the three subsequent patches) is working well on OMAP H4 with
2.6.15-rc4 kernel and passes the LTP fs test.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ee219e5e7c12b742243a080e2d8d288a48a32e44
Author: Jean Delvare <khali@linux-fr.org>
Date: Sat Dec 17 23:20:55 2005 +0100
[PATCH] radeon drm: fix compilation breakage with gcc 2.95.3
Fix a typo which breaks radeon drm compilation with gcc 2.95.3.
The offending line was added back in 2.6.11-rc3, but was harmless
back then. A recent addition nearby changed it into a compilation
breaker: commit 281ab031a8c9e5b593142eb4ec59a87faae8676a.
The doubled semi-colon ends up being an empty instruction, and the
variable declaration thus ends up being in the middle of "code".
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Mark M. Hoffman <mhoffman@lightlink.com>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ff60dde9e46b87757d5e83bd58be0688fca8e816
Author: Dmitry Torokhov <dtor_core@ameritech.net>
Date: Sat Dec 17 11:42:54 2005 -0500
[PATCH] Input: fix an OOPS in HID driver
This patch fixes an OOPS in HID driver when connecting simulation
devices generating unknown simulation events.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5b7b15afee89d6940482259b54d0864b7b2302b0
Author: Jeff Dike <jdike@addtoit.com>
Date: Sun Dec 18 17:50:39 2005 +0100
[PATCH] uml skas0: stop gcc's insanity
With Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
UML skas0 stub has been miscompiling for many people (incidentally not
the authors), depending on the used GCC versions.
I think (and testing on some GCC versions shows) this patch avoids the
fundamental issue which is behind this, namely gcc using the stack when
we have just replaced it, behind gcc's back. The remapping and storage
of the return value is hidden in a blob of asm, hopefully giving gcc no
room for creativity.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 76c842d8f8096e2c98ff9ebe1db861363ff254e5
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Sun Dec 18 17:50:37 2005 +0100
[PATCH] uml - fix some funkiness in Kconfig
So you may have seen the miniconfig stuff wander by, which means that my
build script exits if there's a .config error, and we have this:
fs/Kconfig:1749:warning: 'select' used by config symbol 'CIFS_UPCALL'
refer to undefined symbol 'CONNECTOR'
This makes it shut up.
Signed-off-by: Rob Landley <rob@landley.net>
[ Verified it makes sense. ]
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 53c0b59dcdb7c68c3cfd4b9a0bd17373b785f2eb
Author: Rob Landley <rob@landley.net>
Date: Sun Dec 18 17:50:35 2005 +0100
[PATCH] uml: fix dynamic linking on some 64-bit distros
With Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
The current UML build assumes that on x86-64 systems, /lib is a symlink
to /lib64, but in some distributions (like PLD and CentOS) they are
separate directories, so the 64 bit library loader isn't found. This
patch inserts /lib64 at the start of the rpath on x86-64 UML builds.
Signed-off-by: Rob Landley <rob@landley.net>
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 9ce7677cfd7cd871adb457c80bea3b581b839641
Author: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Sun Dec 18 17:50:32 2005 +0100
[PATCH] uml: arch/um/scripts/Makefile.rules - remove duplicated code
Duplicated code - the patch adding it was probably applied twice without
enough care.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e5508c13ac25b07585229b144a45cf64a990171e
Author: Salyzyn, Mark <mark_salyzyn@adaptec.com>
Date: Sat Dec 17 19:26:30 2005 -0800
[PATCH] dpt_i2o fix for deadlock condition
Miquel van Smoorenburg <miquels@cistron.nl> forwarded me this fix to
resolve a deadlock condition that occurs due to the API change in
2.6.13+ kernels dropping the host locking when entering the error
handling. They all end up calling adpt_i2o_post_wait(), which if you
call it unlocked, might return with host_lock locked anyway and that
causes a deadlock.
Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 87d47d0547631e059c308b392cd2423fe9248c93
Author: Ben Collins <bcollins@ubuntu.com>
Date: Sat Dec 17 18:39:23 2005 -0800
[PATCH] i2o: Do not disable pci device when it's in use
When dpt_i2o is loaded first, i2o being loaded would cause it to call
pci_device_disable, thus breaking dpt_i2o's use of the device. Based on
similar usage of pci_disable_device in other drivers.
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7c3dbbe982ac85837f1da150ea9539a9e9a12557
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Fri Dec 16 22:35:23 2005 +0000
[PATCH] ppc: ppc4xx_dma DMA_MODE_{READ,WRITE} fix
DMA_MODE_{READ,WRITE} are declared in asm-powerpc/dma.h and their
declarations there match the definitions. Old declarations in
ppc4xx_dma.h are not right anymore (wrong type, to start with).
Killed them, added include of asm/dma.h where needed.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a78719c387cc25ed97304a235a20c24f0f89399b
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Fri Dec 16 22:35:28 2005 +0000
[PATCH] ppc: booke_wdt compile fix
booke_wdt.c had been missed in cpu_specs[] removal sweep
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3
Author: Alan Stern <stern@rowland.harvard.edu>
Date: Fri Dec 16 11:09:01 2005 -0800
[PATCH] UHCI: add missing memory barriers
This patch (as617) adds a couple of memory barriers that Ben H. forgot in
his recent suspend/resume fix.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 42f3ab42875a52af7e711803bfb8d8d7cca84c1c
Author: Andi Kleen <ak@suse.de>
Date: Fri Dec 16 11:08:55 2005 -0800
[PATCH] PCI: Fix dumb bug in mmconfig fix
Use correct address when referencing mmconfig aperture while checking
for broken MCFG. This was a typo when porting the code from 64bit to
32bit. It caused oopses at boot on some ThinkPads.
Should definitely go into 2.6.15.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 52f975ea21e28871a371c2d941e13d64c9f8cd66
Author: Milton Miller <miltonm@bga.com>
Date: Fri Dec 16 11:08:48 2005 -0800
[PATCH] PCI express must be initialized before PCI hotplug
PCI express hotplug uses the pcieportbus driver so pcie must be
initialized before hotplug/. This patch changes the link order.
Signed-Off-By: Milton Miller <miltonm@bga.com>
Acked-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit dfded4ae71080b53798c7bbf4628a9b22d1e3e8b
Author: Mark A. Greer <mgreer@mvista.com>
Date: Fri Dec 16 11:08:43 2005 -0800
[PATCH] i2c: Fix i2c-mv64xxx compilation error
The busses/i2c-mv64xxx.c driver doesn't currently compile because of an
incorrect argument to dev_err(). This patch fixes that.
Signed-off-by: Mark A. Greer <mgreer@mvista.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit dc86e88c2bb8a7603ee175fbb6a9e92cf3293dd8
Author: Christoph Lameter <clameter@engr.sgi.com>
Date: Mon Dec 12 09:34:32 2005 -0800
[IA64] Add __read_mostly support for IA64
sparc64, i386 and x86_64 have support for a special data section dedicated
to rarely updated data that is frequently read. The section was created to
avoid false sharing of those rarely read data with frequently written kernel
data.
This patch creates such a data section for ia64 and will group rarely written
data into this section.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit d5bf3165b6fbb879a4658f9da9ca2fe002b75f08
Author: hawkes@sgi.com <hawkes@sgi.com>
Date: Tue Dec 13 13:45:44 2005 -0800
[IA64-SGI] change default_sn2 to NR_CPUS==1024
Change the NR_CPUS default for ia64/sn up to 1024.
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: John Hesterberg <jh@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit d74700e604db717eef7a3112176e6350fb00d0e3
Author: Jack Steiner <steiner@sgi.com>
Date: Thu Dec 15 12:41:22 2005 -0600
[IA64-SGI] Missed TLB flush
I see why the problem exists only on SN. SN uses a different hardware
mechanism to purge TLB entries across nodes.
It looks like there is a bug in the SN TLB flushing code. During context switch,
kernel threads inherit the mm of the task that was previously running on the
cpu. This confuses the code in sn2_global_tlb_purge().
The result is a missed TLB purge for the task that owns the "borrowed" mm.
(I hit the problem running heavy stress where kswapd was purging code pages of
a user task that woke kswapd. The user task took a SIGILL fault trying to
execute code in the page that had been ripped out from underneath it).
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 3bd7f01713f30e7c616ab975ebb84ab7eb58a60a
Author: Jes Sorensen <jes@trained-monkey.org>
Date: Fri Dec 16 11:00:03 2005 -0500
[IA64] uncached ref count leak
Use raw_smp_processor_id() instead of get_cpu() as we don't need the
extra features of get_cpu().
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 4d7672b46244abffea1953e55688c0ea143dd617
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri Dec 16 10:21:23 2005 -0800
Make sure we copy pages inserted with "vm_insert_page()" on fork
The logic that decides that a fork() might be able to avoid copying a VM
area when it can be re-created by page faults didn't know about the new
vm_insert_page() case.
Also make some things a bit more anal wrt VM_PFNMAP.
Pointed out by Hugh Dickins <hugh@veritas.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f5899b5d4fa806403f547dc41312d017d94ec273
Author: John Hawkes <hawkes@sgi.com>
Date: Fri Dec 16 10:00:24 2005 -0800
[IA64] disable preemption in udelay()
The udelay() inline for ia64 uses the ITC. If CONFIG_PREEMPT is enabled
and the platform has unsynchronized ITCs and the calling task migrates
to another CPU while doing the udelay loop, then the effective delay may
be too short or very, very long.
This patch disables preemption around 100 usec chunks of the overall
desired udelay time. This minimizes preemption-holdoffs.
udelay() is now too big to be inline, move it out of line and export it.
Signed-off-by: John Hawkes <hawkes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 281ab031a8c9e5b593142eb4ec59a87faae8676a
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Fri Dec 16 16:52:22 2005 +1100
[PATCH] radeon drm: fix agp aperture map offset
This finally fixes the radeon memory mapping bug that was incorrectly
fixed by the previous patch. This time, we use the actual vram size as
the size to calculate how far to move the AGP aperture from the
framebuffer in card's memory space.
If there are still issues with this patch, they are due to bugs in the X
driver that I'm working on fixing too.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Mark M. Hoffman <mhoffman@lightlink.com>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7b6666530e2736f190a2629c8abe34275054449f
Author: Sergei Shtylylov <sshtylyov@ru.mvista.com>
Date: Thu Dec 15 12:34:30 2005 -0800
[PATCH] Au1550 AC'97 OSS driver spinlock fixes
We have found some issues with Au1550 AC'97 OSS driver in 2.6
(sound/oss/au1550_ac97.c), though it also should concern 2.4 driver
(drivers/sound/au1550_psc.c).
start_dac() grabs a spinlock already held by its caller, au1550_write().
This doesn't show up with the standard UP spinlock impelmentation but when
the different one (mutex based) is in use, a lockup happens.
And the interrupt handlers also didn't grab the spinlock -- that's OK in
the usual kernel but not when the IRQ handlers are threaded. So, they're
grabbing the spinlock now (as every correct interrupt handler should do).
Signed-off-by: Konstantin Baidarov <kbaidarov@ru.mvista.com>
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2f40fb72a2121da44c35f2588ee9abce1dffa2a9
Author: Adrian Bunk <bunk@stusta.de>
Date: Thu Dec 15 12:34:29 2005 -0800
[PATCH] drivers/base/memory.c: unexport the static (sic) memory_sysdev_class
We can't export a static struct to modules.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7767e126ca0f32cd0438455fdd9650f909d2eeb3
Author: Paolo Galtieri <pgaltieri@mvista.com>
Date: Thu Dec 15 12:34:28 2005 -0800
[PATCH] IPMI oops fix
While doing some testing I discovered that if the BIOS on a board does not
properly setup the DMI information it leads to a panic in the IPMI code.
The panic is due to dereferencing a pointer which is not initialized. The
pointer is initialized in port_setup() and/or mem_setup() and used in
init_one_smi() and cleanup_one_si(), however if either port_setup() or
mem_setup() return ENODEV the pointer does not get initialized.
Signed-off-by: Paolo Galtieri <pgaltieri@mvista.com>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ebbd1bce79b3b4778d9e1914a22c42fcfa869cd9
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:19:10 2005 +0000
[PATCH] arch/powerpc/kernel/syscalls.c __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 81f0a91e8f58a7784afe39cda9ac47e9231412a4
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:19:05 2005 +0000
[PATCH] drivers/input/misc/wistron_btns.c NULL noise removal
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 833882b452046d3d5028f6293a0a6d6d3c1eee3c
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:19:00 2005 +0000
[PATCH] mwave: missing __user in ioctl struct declaration
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7877327d9c360ac91f22e4c7f98bcb10c0180969
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:18:55 2005 +0000
[PATCH] drivers/atm/adummy.c NULL noise removal
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e17f008bbeabcd1302d6cf4b5b9659be6d80f1db
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:18:50 2005 +0000
[PATCH] arch/alpha/kernel/machvec_impl.h: C99 struct initializer
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 94299171dd269aab0c97f6254cedb381f10e6348
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:18:45 2005 +0000
[PATCH] dst_ca __user annotations, portability fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b3e5b5b2277f9c047082dcb309f665fe8b5706c1
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:18:40 2005 +0000
[PATCH] ia64 sn __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d3a880e1ff6713b4c846e4d2526a8c7e6ad8469c
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:18:30 2005 +0000
[PATCH] Address of void __user * is void __user * *, not void * __user *
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 78d9955bb06493e7bd78e43dfdc17fb5f1dc59b6
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:18:25 2005 +0000
[PATCH] missing prototype (mm/page_alloc.c)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 538bacf8a4802d209f955726b66891b8a921dabf
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:18:20 2005 +0000
[PATCH] __user annotations (booke_wdt.c)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d22043940eb8d660df9a94e8e439ab4d3d16edab
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:18:15 2005 +0000
[PATCH] arcfb __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit cd0306656c15f355e0e533cc0f08691bb98ca912
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:18:10 2005 +0000
[PATCH] cyber2000fb.c __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e896fd9861181140617aa9ff3a54dac25e46351d
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:18:05 2005 +0000
[PATCH] wdrtas.c: fix __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5ad9201be7f7d52d712fe3c3e841fdc19216ede1
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:18:00 2005 +0000
[PATCH] dell_rbu: NULL noise removal
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c4aa02eb3939c5004782454434e4d50de471b53d
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:17:55 2005 +0000
[PATCH] cm4000_cs: __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b16b88e55d808a6324d5ff02d8c686f7884870f8
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:17:50 2005 +0000
[PATCH] i386,amd64: ioremap.c __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8b8a4e33e4a320735f353a092013b314f142493d
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:17:44 2005 +0000
[PATCH] i386,amd64: mmconfig __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8bcc247617deaf229962e9d663c69e65523519ab
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:17:39 2005 +0000
[PATCH] em28xx: %zd for size_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 53b3de1ea2f81de7050f247cd7fc63863887e8d7
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:17:34 2005 +0000
[PATCH] auerswald.c: %zd for size_t
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 37eb47ed445f4ca1247f3c7b600c0885c2ca8c31
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:17:29 2005 +0000
[PATCH] s2io: __iomem annotations for recent changes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 51bfb75b0b2652f60ab1200627e9041f4624c819
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:17:24 2005 +0000
[PATCH] xfs: missing gfp_t annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b53cb2a4ab276796ad299597d6e7e2317b514ca8
Author: Al Viro <viro@ftp.linux.org.uk>
Date: Thu Dec 15 09:17:19 2005 +0000
[PATCH] iscsi gfp_t annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 80ce8baf5da730c87194e2e38a4cfca0254f9599
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue Dec 6 06:04:55 2005 -0500
[PATCH] arch/sparc/kernel/led.c __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a32972965e23471f0762a1136f80990ebf72406a
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue Dec 6 05:56:39 2005 -0500
[PATCH] sun4c_memerr_reg __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit e4fe342f932346a306f98f5401ad510b890c0a15
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Sun Dec 4 18:48:45 2005 -0500
[PATCH] sparc: NULL noise removal (ebus.c)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c316ef0494eec2d08df2f083fc06fc06a6fd48c6
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue Dec 6 05:55:44 2005 -0500
[PATCH] sparc/kernel/time: __iomem annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit fec607fff973b1d7805c1bbce5834690857e7801
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue Dec 6 05:54:54 2005 -0500
[PATCH] sbus/char/uctrl: missing prototypes and NULL noise removal
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit bc05d83bbf20a32eb24624726d1027aa960a573c
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue Dec 6 05:51:43 2005 -0500
[PATCH] sparc: jsflash __user annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b7c690b52f424574f7ac8c607e71e9f5c283a557
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue Dec 6 05:50:56 2005 -0500
[PATCH] sparc: vfc __iomem annotations and fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit f8ad23a401d41f90cb377035d206b41de0699a0b
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue Dec 6 05:44:18 2005 -0500
[PATCH] fix iomem annotations in sparc32 pcic code
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2499604960fff307fe99ff4d4363c50eaa69235a
Author: Jeff Mahoney <jeffm@suse.com>
Date: Wed Dec 14 14:38:05 2005 -0500
[PATCH] reiserfs: close open transactions on error path
The following patch fixes a bug where if the journal is aborted, it can
leave a transaction open. The result will be a BUG when another code
path attempts to start a transaction and will get a "nesting into
different fs" error, since current->journal_info will be left non-NULL.
Original fix against SUSE kernel by Chris Mason <mason@suse.com>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5d5e815618c4a8b53806845268c951201d14af6e
Author: Jeff Mahoney <jeffm@suse.com>
Date: Wed Dec 14 14:38:36 2005 -0500
[PATCH] reiserfs: skip commit on io error
This should have been part of the original io error patch, but got
dropped somewhere along the way.
It's extremely important when handling the i/o error in the journal to
not commit the transaction with corrupt data. This patch adds that code
back in.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ea54c96c04cfd9fec881e403d8f7931b47f7b2a6
Author: Vojtech Pavlik <vojtech@suse.cz>
Date: Wed Dec 14 21:47:00 2005 -0500
[PATCH] Input: ALPS - correctly report button presses on Fujitsu Siemens S6010
Without this patch Forward and Backward buttons on the touchpad do not
generate any events.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c45b4f1f1e149c023762ac4be166ead1818cefef
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed Dec 14 18:52:21 2005 -0800
Move size optimization option outside of EMBEDDED menu, mark it EXPERIMENTAL
Also, disable on sparc64 - a number of people report breakage. Probably
a compiler bug, but it's quite possible that it tickles some latent
kernel problem too.
It still defaults to 'y' everywhere else (when enabled through
EXPERIMENTAL), and Dave Jones points out that Fedora (and RHEL4) has
been building with size optimizations for a long time on x86, x86-64,
ia64, s390, s390x, ppc32 and ppc64. So it is really only moderately
experimental, but the sparc64 breakage certainly shows that it can
trigger "issues".
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0afaa4fc4abc773ce129f41009a50eeecf3aa50c
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu Dec 15 02:20:49 2005 +0100
[PATCH] ide-cd: remove write-only cmd field from struct cdrom_info
commit 7b4df9ece9b4c4a754bd1f5603cdabff26b987e5
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu Dec 15 02:20:15 2005 +0100
[PATCH] ide: cleanup ide_driver_t
Remove unused fields: ioctl, ata[pi]_prebuilder.
commit 517bd1d5eac739a7f398058a9524386667fff032
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu Dec 15 02:19:57 2005 +0100
[PATCH] ide: cleanup ide.h
Remove:
* stale comment
* unused HOST() macro
* unused ata_{error,control}_t types
* unused atapi_select_t type
* ide_init_subdrivers() prototype
commit d36fef6f5aa4a6a1f44490455393a5b22137a6cd
Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Date: Thu Dec 15 02:19:20 2005 +0100
[PATCH] ide-disk: flush cache after calling del_gendisk()
commit 8f29e650bffc1e22ed6b2d0b321bc77627f3bb7a
Author: Jordan Crouse <jordan.crouse@amd.com>
Date: Thu Dec 15 02:17:46 2005 +0100
[PATCH] ide: AU1200 IDE update
Changes here include removing all of CONFIG_PM while it is being repeatedly
smacked with a lead pipe, moving the BURSTMODE param to a #define (it should
be defined almost always anyway), fixing the rqsize stuff, pulling ide_ioreg_t,
and general cleanups and whatnot.
Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
commit 65e5f2e3b457b6b20a5c4481312189d141a33d24
Author: Jordan Crouse <jordan.crouse@amd.com>
Date: Thu Dec 15 02:16:18 2005 +0100
[PATCH] ide: core modifications for AU1200
bart: slightly modified by me
Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
commit 38f9d412be1ed29ee3b41782f22fd85b1c95fbed
Author: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Date: Thu Dec 15 02:12:53 2005 +0100
[PATCH] ide: MPC8xx IDE depends on IDE=y && BLK_DEV_IDE=y
The following patch adds a dependancy on IDE=y && BLK_DEV_IDE=y
for the MPC8xx IDE driver.
The code is not modular at the moment (init called from platform setup code).
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
commit ceef833bae05e393859f1946a9802fb61f0febdf
Author: Daniel Drake <dsd@gentoo.org>
Date: Thu Dec 15 02:11:55 2005 +0100
[PATCH] via82cxxx IDE: Add VT8251 ISA bridge
Some motherboards (such as the Asus P5V800-MX) ship a
PCI_DEVICE_ID_VIA_82C586_1 IDE controller alongside a VT8251 southbridge.
This southbridge is currently unrecognised in the via82cxxx IDE driver,
preventing those users from getting DMA access to disks.
Signed-off-by: Daniel Drake <dsd@gentoo.org>
commit deb5e5c0c68e59b1bf9ede66da9e6a89f6557595
Author: Jeremy Higdon <jeremy@sgi.com>
Date: Thu Dec 15 02:10:35 2005 +0100
[PATCH] sgiioc4: check for no hwifs available
Add a check to the sgiioc4 driver for the case where all available
ide_hwifs structures are in use.
Signed-off-by: Jeremy Higdon <jeremy@sgi.com>
commit a388442c3798a345d131ff8b9d6dea0bfda3fefc
Author: Stephen Hemminger <shemminger@osdl.org>
Date: Wed Dec 14 16:23:16 2005 -0800
[VLAN]: Fix hardware rx csum errors
Receiving VLAN packets over a device (without VLAN assist) that is
doing hardware checksumming (CHECKSUM_HW), causes errors because the
VLAN code forgets to adjust the hardware checksum.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c2e2611425a956d25d2948c5d95d3848c4db1257
Author: Daniel Jacobowitz <drow@false.org>
Date: Wed Dec 14 22:04:22 2005 +0000
[ARM] 3205/1: Handle new EABI relocations when loading kernel modules.
Patch from Daniel Jacobowitz
Handle new EABI relocations when loading kernel modules. This is
necessary for CONFIG_AEABI kernels, and also for some broken
(since fixed) old ABI toolchains.
Signed-off-by: Daniel Jacobowitz <dan@codesourcery.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 1542272a60ab9c0655a13ead8b7d7a661365f9fb
Author: Herbert Xu <herbert@gondor.apana.org.au>
Date: Wed Dec 14 12:55:24 2005 -0800
[GRE]: Fix hardware checksum modification
The skb_postpull_rcsum introduced a bug to the checksum modification.
Although the length pulled is offset bytes, the origin of the pulling
is the GRE header, not the IP header.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 27af4cfd11883073359bd5acab1962b0fa96a3bf
Author: Robin Holt <holt@sgi.com>
Date: Wed Dec 14 06:58:05 2005 -0600
[IA64] fix for SET_PERSONALITY when CONFIG_IA32_SUPPORT is not set.
Missed this when fixing the SET_PERSONALITY change.
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 45f8245b972e360c19aec9032e2a2033b8ac3719
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Wed Dec 14 14:57:35 2005 +0000
[MMC] Explain the internals of mmc_power_up()
It seems that people get confused about what is happening in
mmc_power_up(). Add a comment to make it clear why we have
a two stage process.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 2edc2689f8183dd21c45621a01580b340ac420ba
Author: David S. Miller <davem@davemloft.net>
Date: Tue Dec 13 22:59:50 2005 -0800
[PKT_SCHED]: Disable debug tracing logs by default in packet action API.
Noticed by Andi Kleen.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a1493d9cd1aaed06860d128a37df1bdfbc61f7c8
Author: David S. Miller <davem@davemloft.net>
Date: Tue Dec 13 22:59:36 2005 -0800
[IPV6] addrconf: Do not print device pointer in privacy log message.
Noticed by Andi Kleen, it is pointless to emit the device
structure pointer in the kernel logs like this.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit c9526497cf03ee775c3a6f8ba62335735f98de7a
Author: James Bottomley <James.Bottomley@steeleye.com>
Date: Fri Dec 9 17:45:22 2005 -0500
[SCSI] Consolidate REQ_BLOCK_PC handling path (fix ipod panic)
This follows on from Jens' patch and consolidates all of the ULD
separate handlers for REQ_BLOCK_PC into a single call which has his
fix for our direction bug.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit cd6104572bca9e4afe0dcdb8ecd65ef90b01297b
Author: Adam Kropelin <akropel1@rochester.rr.com>
Date: Tue Dec 13 17:03:39 2005 -0800
[PATCH] hid-core: Zero-pad truncated reports
When it detects a truncated report, hid-core emits a warning and then
processes the report as usual. This is good because it allows buggy
devices to still get data thru to userspace. However, the missing bytes of
the report should be cleared before processing, otherwise userspace will be
handed partially-uninitialized data.
This fixes Debian tracker bug #330487.
Signed-off-by: Adam Kropelin <akropel1@rochester.rr.com>
Cc: Vojtech Pavlik <vojtech@suse.cz>
Acked-by: Dmitry Torokhov <dtor_core@ameritech.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit fb79ffa4ddbe3f6f30fdb8429b5bad84d25ae6ef
Author: Ole Reinhardt <ole.reinhardt@kernelconcepts.de>
Date: Tue Dec 13 17:03:38 2005 -0800
[PATCH] fbdev: make pxafb more robust to errors with CONFIG_FB_PXA_PARAMETERS
pxafb.c runs into an oops if CONFIG_FB_PXA_PARAMETERS is enabled and no
parameters are set in command line. The following patch avoids this
problem.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 118c71bcacce82a4317c9bd99c6a15af14020aee
Author: Yasunori Goto <y-goto@jp.fujitsu.com>
Date: Tue Dec 13 17:03:37 2005 -0800
[PATCH] Fix calculation of grow_pgdat_span() in mm/memory_hotplug.c
The calculation for node_spanned_pages at grow_pgdat_span() is clearly
wrong. This is patch for it.
(Please see grow_zone_span() to compare. It is correct.)
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Acked-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 664d22ab954de54e52e0f71103a89c7a78738adc
Author: Vojtech Pavlik <vojtech@ucw.cz>
Date: Tue Dec 13 17:03:36 2005 -0800
[PATCH] Dmitry Torokhov is input subsystem maintainer
I haven't been very actively maintaining the input layer in past months,
mostly because of my lack of time to concentrate on that. For that reason,
I've decided to pass the maintainership of the Linux Input Layer to Dmitry
Torokhov, whom I trust to do the job very well.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Cc: Dmitry Torokhov <dtor_core@ameritech.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6921d201f77e14848df2eaa597e26525f468abea
Author: Michael Chan <mchan@broadcom.com>
Date: Tue Dec 13 21:15:53 2005 -0800
[TG3]: Fix low power state
Fix the following bugs in tg3_set_power_state():
1. Both WOL and ASF flags require switching to aux power.
2. Add a missing handshake with firmware to enable WOL.
3. Turn off the PHY if both WOL and ASF are disabled.
4. Add nvram arbitration before halting the firmware.
5. Fix tg3_setup_copper_phy() to switch to 100Mbps when
changing to low power state.
Update revision and date.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 16fe9d74f14ed74af778c5db7f9129e29916f4a7
Author: Michael Chan <mchan@broadcom.com>
Date: Tue Dec 13 21:09:54 2005 -0800
[TG3]: Fix 5704 single-port mode
If the dual-port 5704 is configured as a single-port device with
only one PCI function, it would trigger a BUG() condition in
tg3_find_5704_peer(). This fixes the problem by returning its
own pdev if the peer cannot be found.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6a9eba15f51c56da637e45ea1316eaa2a848986a
Author: Michael Chan <mchan@broadcom.com>
Date: Tue Dec 13 21:08:58 2005 -0800
[TG3]: Fix suspend and resume
Fix tg3_suspend() and tg3_resume() by clearing and setting the
TG3_FLAG_INIT_COMPLETE flag when appropriate. tg3_set_power_state()
looks at TG3_FLAG_INIT_COMPLETE on the peer device to determine
when to appropriately switch to aux power.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 381291b7d3e17ac966498312dc571dcca1b93efc
Author: Michael Chan <mchan@broadcom.com>
Date: Tue Dec 13 21:08:21 2005 -0800
[TG3]: Fix nvram arbitration bugs.
The nvram arbitration rules were not strictly followed in a few places
and this could lead to reading corrupted values from the nvram.
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 322e079f1b606e46b79bb8b8e6cf6110b5f2aa3f
Author: Matthew Wilcox <matthew@wil.cx>
Date: Tue Nov 29 23:08:40 2005 -0500
[SCSI] Negotiate correctly with async-only devices
When we got a device only capable of async, we would zero out goal->period
which would cause us to try PPR negotiations. Leave goal->period alone,
and check goal->offset before doing PPR. Kudos to Daniel Forsgren for
figuring this out.
Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 0910b444bcd7ea7f437a3ff48e0e3d2495ead22e
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue Dec 13 11:39:05 2005 -0800
Expose "Optimize for size" option for everybody
Let's put my money where my mouth is. Smaller code is almost always
faster, if only because a single I$ miss ends up leaving a lot of cycles
to make up for. And system software - kernels in particular - are known
for taking more cache misses than most other kinds.
On my random config, this made the kernel about 10% smaller, and lmbench
seems to say that it's pretty uniformly faster too. Your milage may vary.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit eed66cfcbbea851c97e287440d940286fce3f829
Author: Tony Luck <tony.luck@intel.com>
Date: Tue Dec 13 10:41:49 2005 -0800
[IA64] Split 16-bit severity field in sal_log_record_header
ERR_SEVERITY item is defined as a 8 bits item in SAL documentation
($B.2.1 rev december 2003), but as an u16 in sal.h.
This has the side effect that current code in mca.c may not call
ia64_sal_clear_state_info() upon receiving corrected platform errors
if there are bits set in the validation byte. Reported by Xavier Bru.
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 83bab9a4bbf91af93f45233dc288c4d26308e281
Author: Adrian Bunk <bunk@stusta.de>
Date: Tue Dec 13 02:58:07 2005 +0100
[PATCH] allow KOBJECT_UEVENT=n only if EMBEDDED
KOBJECT_UEVENT=n seems to be a common pitfall for udev users in 2.6.14 .
-mm already contains a bigger patch removing this option that is IMHO
too big for being applied now to 2.6.15-rc.
This patch simply allows KOBJECT_UEVENT=n only if EMBEDDED.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 98684a9d91bceff829b6dc7adf0f662d59cfa6e3
Author: Jeff Garzik <jgarzik@pobox.com>
Date: Tue Dec 13 11:35:22 2005 -0500
[netdrvr skge] fix build
commit 50630195bbdfe1ca775d94cd68a5f18bc1b717e4
Author: Jeff Garzik <jgarzik@pobox.com>
Date: Tue Dec 13 02:29:45 2005 -0500
[libata] mark certain hardware (or drivers) with a no-atapi flag
Some hardware does not support the PACKET command at all.
Other hardware supports ATAPI, but the driver does something nasty such
as calling BUG() when an ATAPI command is issued.
For these such cases, we mark them with a new flag, ATA_FLAG_NO_ATAPI.
Initial version contributed by Ben Collins.
commit be0d9b6c7aeaad1683059c00131cabd4c894c17c
Author: Antonino A. Daplas <adaplas@gmail.com>
Date: Mon Dec 12 22:17:21 2005 -0800
[PATCH] fbdev: Fix incorrect unaligned access in little-endian machines
The drawing function cfbfillrect does not work correctly when access is not
unsigned-long aligned. It manifests as extra lines of pixels that are not
complete drawn. Reversing the shift operator solves the problem, so I would
presume that this bug would manifest only on little endian machines. The
function cfbcopyarea may also have this bug.
Aligned access should present no problems.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7275b4b6bc2f783c135c3f0eeecc4fdc6e788aa8
Author: Antonino A. Daplas <adaplas@gmail.com>
Date: Mon Dec 12 22:17:20 2005 -0800
[PATCH] fbdev: Shift pixel value before entering loop in cfbimageblit
In slow imageblit, the pixel value is shifted by a certain amount (dependent
on the bpp and endianness) for each iteration. This is inefficient. Better
do the shifting once before going into the loop.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 39942fd8ff57c8623451bbfaffe8a184cc8b463a
Author: Knut Petersen <Knut_Petersen@t-online.de>
Date: Mon Dec 12 22:17:19 2005 -0800
[PATCH] fbdev: fix switch to KD_TEXT, enhanced version
Every framebuffer driver relies on the assumption that the set_par()
function of the driver is called before drawing functions and other
functions dependent on the hardware state are executed.
Whenever you switch from X to a framebuffer console for the very first
time, there is a chance that a broken X system has _not_ set the mode to
KD_GRAPHICS, thus the vt and framebuffer code executes a screen redraw and
several other functions before a set_par() is executed. This is believed
to be not a bug of linux but a bug of X/xdm. At least some X releases used
by SuSE and Debian show this behaviour.
There was a 2nd case, but that has been fixed by Antonino Daplas on
10-dec-2005.
This patch allows drivers to set a flag to inform fbcon_switch() that they
prefer a set_par() call on every console switch, working around the
problems caused by the broken X releases.
The flag will be used by the next release of cyblafb and might help other
drivers that assume a hardware state different to the one used by X.
As the default behaviour does not change, this patch should be acceptable
to everybody.
Signed-off-by: Knut Petersen <Knut_Petersen@t-online.de>
Acked-by: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4e1567d3aad9bae0ecc5bb047179cd026bfb035c
Author: Antonino A. Daplas <adaplas@gmail.com>
Date: Mon Dec 12 22:17:18 2005 -0800
[PATCH] fbcon: Avoid illegal display panning
Avoid calls to fb_pan_display when driver is suspended or not in text mode.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1207069f6f8f3d1b71641fdaa6cc04fca6fff9f5
Author: Antonino A. Daplas <adaplas@gmail.com>
Date: Mon Dec 12 22:17:17 2005 -0800
[PATCH] fbdev: Pan display fixes
- Fix fb_pan_display rejecting yoffsets that are valid if panning mode
is ywrap.
- Add more robust error checking in fb_pan_display specially since this
function is accessible by userland apps.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 4743484718e1d710321f24f8ef7d0124a48291b3
Author: Antonino A. Daplas <adaplas@gmail.com>
Date: Mon Dec 12 22:17:16 2005 -0800
[PATCH] fbcon: Add ability to save/restore graphics state
Add hooks to save and restore the graphics state. These hooks are called in
fbcon_blank() when entering/leaving KD_GRAPHICS mode. This is needed by
savagefb at least so it can cooperate with savage_dri and by cyblafb.
State save/restoration can be full or partial.
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 56f0d64de80733bda54d1cfa7ac0c736ab2de33b
Author: Antonino A. Daplas <adaplas@pol.net>
Date: Mon Dec 12 22:17:15 2005 -0800
[PATCH] fbcon: fix complement_mask() with 512 character map
There is a bug in the complement_mask when you have a 512-character map.
Linux boots to a default 256-character map and most probably your login
profile is loading a 512-character map which results in a bad gpm cursor.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2f6331faf58a4727a9f1138cd6db30d05b124220
Author: Mike Miller <mike.miller@hp.com>
Date: Mon Dec 12 22:17:14 2005 -0800
[PATCH] cciss: fix for deregister_disk
This patch adds setting our drv->queue = NULL back in deregister_disk. The
drv->queue is part of our controller struct. blk_cleanup_queue works only
on the queue in the gendisk struct.
Signed-off-by: Mike Miller <mike.miller@hp.com>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8309cf66fd90ccba9894adde2f3a8d7e1507e4d2
Author: Eric Dumazet <dada1@cosmosbay.com>
Date: Mon Dec 12 22:17:14 2005 -0800
[PATCH] x86_64: Bug correction in populate_memnodemap()
As reported by Keith Mannthey, there are problems in populate_memnodemap()
The bug was that the compute_hash_shift() was returning 31, with incorrect
initialization of memnodemap[]
To correct the bug, we must use (1UL << shift) instead of (1 << shift) to
avoid an integer overflow, and we must check that shift < 64 to avoid an
infinite loop.
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit fd4954714e8e7db9f6eb5878fa6111c46445ca81
Author: john stultz <johnstul@us.ibm.com>
Date: Mon Dec 12 22:17:13 2005 -0800
[PATCH] x86_64: Fix collision between pmtimer and pit/hpet
On systems that do not support the HPET legacy functions (basically the IBM
x460, but there could be others), in time_init() we accidentally fall into a
PM timer conditional and set the vxtime_hz value to the PM timer's frequency.
We then use this value with the HPET for timekeeping.
This patch (which mimics the behavior in time_init_gtod) corrects the
collision.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit df818a52fb5e64c72b21029fb9ba80583106932c
Author: Andi Kleen <ak@suse.de>
Date: Mon Dec 12 22:17:12 2005 -0800
[PATCH] x86_64: Fix 32bit thread coredumps
When a register set is passed in don't try to fix up the pointer.
Noticed by Al Viro
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit d6ece5491ae71ded1237f59def88bcd1b19b6f60
Author: Andi Kleen <ak@suse.de>
Date: Mon Dec 12 22:17:11 2005 -0800
[PATCH] i386/x86-64 Correct for broken MCFG tables on K8 systems
They report all busses as MMCONFIG capable, but it never works for the
internal devices in the CPU's builtin northbridge.
It just probes all func 0 devices on bus 0 (the internal northbridge is
currently always on bus 0) and if they are not accessible using MCFG they are
put into a special fallback bitmap.
On systems where it isn't we assume the BIOS vendor supplied correct MCFG.
Requires the earlier patch for mmconfig type1 fallback
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 928cf8c62763349efc550a12f6518e52c3390906
Author: Andi Kleen <ak@suse.de>
Date: Mon Dec 12 22:17:10 2005 -0800
[PATCH] i386/x86-64 Fall back to type 1 access when no entry found
When there is no entry for a bus in MCFG fall back to type1. This is
especially important on K8 systems where always some devices can't be accessed
using mmconfig (in particular the builtin northbridge doesn't support it for
its own devices)
Cc: <gregkh@suse.de>
Cc: <jgarzik@pobox.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit bf5421c309bb89e5106452bc840983b1b4754d61
Author: Andi Kleen <ak@suse.de>
Date: Mon Dec 12 22:17:09 2005 -0800
[PATCH] i386/x86-64: Don't call change_page_attr with a spinlock held
It's illegal because it can sleep.
Use a two step lookup scheme instead. First look up the vm_struct, then
change the direct mapping, then finally unmap it. That's ok because nobody
can change the particular virtual address range as long as the vm_struct is
still in the global list.
Also added some LinuxDoc documentation to iounmap.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5e9ef02ec00c70840661d174dc2f4862db471bb6
Author: Shaohua Li <shaohua.li@intel.com>
Date: Mon Dec 12 22:17:08 2005 -0800
[PATCH] i386/x86-64 disable LAPIC completely for offline CPU
Disabling LAPIC timer isn't sufficient. In some situations, such as we
enabled NMI watchdog, there is still unexpected interrupt (such as NMI)
invoked in offline CPU. This also avoids offline CPU receives spurious
interrupt and anything similar.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Acked-by: "Seth, Rohit" <rohit.seth@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 68e188911263adb06e28fa2c9dc9e017774de68d
Author: Andi Kleen <ak@suse.de>
Date: Mon Dec 12 22:17:07 2005 -0800
[PATCH] x86_64: Make sure hpet_address is 0 when any part of HPET initialization fails
Otherwise TSC->HPET fallback could see incorrect state and crash later.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 47807ce381acc34a7ffee2b42e35e96c0f322e52
Author: Dave Airlie <airlied@linux.ie>
Date: Tue Dec 13 04:18:41 2005 +0000
[drm] fix radeon aperture issue
Ben noticed that on certain cards we've landed the AGP space on top of
the second aperture instead of after it.. Which messes things up a lot
on those machines.
This just moves the gart further out, a more correct fix is in the works
from Ben for after 2.6.15.
Signed-off-by: Dave Airlie <airlied@linux.ie>
CC: Ben Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1cf9e8a7865c0ac216034e519cf6b8505055ea50
Author: Olaf Hering <olh@suse.de>
Date: Thu Dec 1 21:22:37 2005 +0100
[PATCH] ieee80211_crypt_tkip depends on NET_RADIO
*** Warning: ".wireless_send_event" [net/ieee80211/ieee80211_crypt_tkip.ko] undefined!
Signed-off-by: Olaf Hering <olh@suse.de>
net/ieee80211/Kconfig | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
commit ee1c81917a0c10f44c1b400482b8372e68238ff8
Author: Stephen Hemminger <shemminger@osdl.org>
Date: Tue Dec 6 15:01:49 2005 -0800
[PATCH] skge: get rid of warning on race
Get rid of warning in case of race with ring full and lockless
tx on the skge driver. It is possible to be in the transmit
routine with no available slots and already stopped.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
commit d51e86c18a479f1dbcef3aa20e58ad04d1233016
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Mon Dec 5 16:28:59 2005 -0500
ieee1394: write broadcast_channel only to select nodes (fixes device recognition)
Some old 1394-1995 SBP-2 bridges would hang if they received a broadcast write
request to BROADCAST_CHANNEL before the config ROM was read. Affected devices
include Datafab MD2-FW2 2.5" HDD and SmartDisk VST FWCDRW-V8 portable CD writer.
The write request is now directed to specific nodes instead of being broadcast
to all nodes at once, and it is only performed if a previous read request at
this register succeeded.
Fixes an old interoperability problem which was perceived as a 2.6.14-specific
regression: http://marc.theaimsgroup.com/?t=113190586800003
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>
(cherry picked from 61c7f775ca25ccfc0e51486103a724fb1a3a08f2 commit)
commit 48622b7bde008387218a416586e9d072b385f1ae
Author: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Thu Dec 1 18:51:52 2005 -0500
ieee1394: resume remote ports when starting a host (fixes device recognition)
After initializing an IEEE 1394 host, broadcast a resume packet. This makes
remote nodes visible which suspended their ports while the host was down.
Such nodes had to be unplugged and replugged in order to be recognized.
Motorola DCT6200 cable reciever was affected, probably other devices too.
http://marc.theaimsgroup.com/?t=113202715800001
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Jody McIntyre <scjody@modernduck.com>
(cherry picked from 14c0fa243b358c24040ff5f44b60c47aaf6430c3 commit)
commit dfa159886f38344ede31e3b13ec614e0bebc09c6
Author: Mark Lord <liml@rtr.ca>
Date: Mon Dec 12 23:19:28 2005 -0500
[PATCH] libata-core.c: fix parameter bug on kunmap_atomic() calls
Fix incorrect pointer usage on two calls to kunmap_atomic().
This seems to happen a lot, because kunmap() wants the struct page *,
whereas kunmap_atomic() instead wants the mapped virtual address.
Signed-off-by: Mark Lord <liml@rtr.ca>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
commit 1ff8038988adecfde71d82c0597727fc239d4e8c
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon Dec 12 16:24:33 2005 -0800
get_user_pages: don't try to follow PFNMAP pages
Nick Piggin points out that a few drivers play games with VM_IO (why?
who knows..) and thus a pfn-remapped area may not have that bit set even
if remap_pfn_range() set it originally.
So make it explicit in get_user_pages() that we don't follow VM_PFNMAP
pages, since pretty much by definition they do not have a "struct page"
associated with them.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 2f9616d4c44349c903bc1b54fe46ab0ce0210b74
Author: Marcus Sundberg <marcus@ingate.com>
Date: Mon Dec 12 15:02:48 2005 -0800
[NETFILTER]: ip_nat_tftp: Fix expectation NAT
When a TFTP client is SNATed so that the port is also changed, the
port is never changed back for the expected connection.
Signed-off-by: Marcus Sundberg <marcus@ingate.com>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1df2ab48f995b1599740a3f430df77fe24cb8ce9
Author: Paul Jackson <pj@sgi.com>
Date: Mon Dec 12 14:42:44 2005 -0800
[SPARC]: block/ needed in final image link
With this fix, sparc links vmlinuz again using crosstool. Without this
fix, the final link fails missing several dozen dozen symbols, beginning
with:
kernel/built-in.o(.text+0x6fd0): In function `do_exit':
: undefined reference to `exit_io_context'
(exit_io_context is defined in block/ll_rw_blk.c).
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 1d66a79dc8dd892c0db04396a0b1d05e0f53fe4f
Author: Paul Jackson <pj@sgi.com>
Date: Mon Dec 12 14:42:31 2005 -0800
[SPARC]: atomic_clear_mask build fix
This fixes one build error introduced in sparc with the patch of Oct 30,
resent Nov 4 "[patch 3/5] atomic: atomic_inc_not_zero" I still can't get
sparc to build, but at least it gets further after I remove this line.
Apparently, this change was agreed to by Andrew and Nick on Nov 14, but
everyone thought someone else was doing it.
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 2c27d4e53043de1c821e0af09e08dee3e92a01d6
Author: Hareesh Nagarajan <hnagar2@gmail.com>
Date: Mon Dec 12 14:42:07 2005 -0800
[SBUSFB] tcx: Use FB_BLANK_UNBLANK instead of magic constant.
From: Hareesh Nagarajan <hnagar2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 806f7bf605bdb0f2ea2253f832943890edb85d83
Author: David S. Miller <davem@davemloft.net>
Date: Mon Dec 12 14:41:20 2005 -0800
[SBUSFB]: Kill 'list' member from foo_par structs, totally unused.
Based upon a patch from Hareesh Nagarajan.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit ecc51b6d5ca04bb6346c9ad6b37d6ca8bace12b3
Author: Arnaldo Carvalho de Melo <acme@mandriva.com>
Date: Mon Dec 12 14:38:10 2005 -0800
[TCPv6]: Fix skb leak
Spotted by Francois Romieu, thanks!
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 66e05225262cd9271fac13fe2fd1e9edb65e3978
Author: Brian King <brking@us.ibm.com>
Date: Mon Dec 12 13:05:08 2005 -0600
[PATCH] Fix SCSI scanning slab corruption
There is a double free in the scsi scan code if a LLDD's slave_alloc()
call fails. There is a direct call to scsi_free_queue and then the
following put_device calls the release function, which also frees the
queue.
Remove the redundant scsi_free_queue.
Signed-off-by: Brian King <brking@us.ibm.com>
Tested-by: Nathan Lynch <ntl@pobox.com>
[ Also removed some strange whitespace artifacts in that area ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 016cc85072944bfa03c5e4b587ae89588ce2e5df
Author: Olaf Hering <olh@suse.de>
Date: Fri Dec 9 19:12:10 2005 +0100
[PATCH] pcnet32: use MAC address from prom also on powerpc
The CSR contains garbage after a coldboot on RS/6000.
One some systems (like my 44p 270) the MAC address is all FF,
on others (like my B50) it is ff:ff:ff:fd:ff:6b.
It can eventually be fixed by loading pcnet32, set the interface
into the UP state, rmmod pcnet32 and load it again. But this worked
only on the 270.
Only netbooting after a cold start provides the correct MAC address
via prom and CSR. This makes it very unreliable.
I dont know why the MAC is stored in two different places. Remove
the special case for powerpc, which was added in early 2.4 development.
Signed-off-by: Olaf Hering <olh@suse.de>
drivers/net/pcnet32.c | 5 -----
1 files changed, 5 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
commit 1a68de5c08be8c77c4ad208306187bd95107c7cd
Author: Brian King <brking@us.ibm.com>
Date: Mon Dec 12 13:05:08 2005 -0600
[SCSI] fix double free of scsi request queue
Current scsi scanning code appears to have a use after free
bug is a LLDD's slave_alloc fails. Remove the redundant
scsi_free_queue.
Signed-off-by: Brian King <brking@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 49d7bc64283970ee83d2c954d04ba00d04e5943d
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon Dec 12 11:25:04 2005 -0800
Revert revert of "[SCSI] fix usb storage oops"
This reverts commit 1b0997f561bf46689cc6e0903f342e9bf2506bf1, which in
turn reverted 34ea80ec6a02ad02e6b9c75c478c18e5880d6713 (which is thus
re-instated).
Quoth James Bottomley:
"All it's doing is deferring the device_put() from the
scsi_put_command() to after the scsi_run_queue(), which doesn't fix
the sleep while atomic problem of the device release method. In both
cases we still get the semaphore in atomic context problem which is
caused by scsi_reap_target() doing a device_del(), which I assumed
(wrongly) was valid from atomic context."
who also promised to fix scsi_reap_target().
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5036805be7b815eb18dcce489d974f3aee4f3841
Author: NeilBrown <neilb@suse.de>
Date: Mon Dec 12 02:39:17 2005 -0800
[PATCH] md: use correct size of raid5 stripe cache when measuring how full it is
The raid5 stripe cache was recently changed from fixed size (NR_STRIPES) to
variable size (conf->max_nr_stripes). However there are two places that still
use the constant and as a result, reducing the size of the stripe cache can
result in a deadlock.
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3795bb0fc52fe2af2749f3ad2185cb9c90871ef8
Author: NeilBrown <neilb@suse.de>
Date: Mon Dec 12 02:39:16 2005 -0800
[PATCH] md: fix a use-after-free bug in raid1
Who would submit code with a FIXME like that in it !!!!
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 0de502aa44aae5712a18d471818d6c785e07c92e
Author: Andrew Morton <akpm@osdl.org>
Date: Mon Dec 12 00:37:41 2005 -0800
[PATCH] raw driver: Kconfig fix
CONFIG_MAX_RAW_DEVS should appear immediately after CONFIG_RAW_DRIVER.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit a64882e795cc1d890e3359d0aa143af1cf67e8d4
Author: Dave Jones <davej@redhat.com>
Date: Mon Dec 12 00:37:40 2005 -0800
[PATCH] ACPI: fix sleeping whilst atomic warnings on resume
This has been broken for months. On resume, we call acpi_pci_link_set()
with interrupts off, so we get a warning when we try to do a kmalloc of non
atomic memory. The actual allocation is just 2 long's (plus extra byte for
some reason I can't fathom), so a simple conversion to GFP_ATOMIC is
probably the safest way to fix this.
The error looks like this..
Debug: sleeping function called from invalid context at mm/slab.c:2486
in_atomic():0, irqs_disabled():1
[<c0143f6c>] kmem_cache_alloc+0x40/0x56
[<c0206a2e>] acpi_pci_link_set+0x3f/0x17f
[<c0206f96>] irqrouter_resume+0x1e/0x3c
[<c0239bca>] __sysdev_resume+0x11/0x6b
[<c0239e88>] sysdev_resume+0x34/0x52
[<c023de21>] device_power_up+0x5/0xa
Signed-off-by: Dave Jones <davej@redhat.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 66d43e98ea6ff291cd4e524386bfb99105feb180
Author: Haren Myneni <haren@us.ibm.com>
Date: Mon Dec 12 00:37:39 2005 -0800
[PATCH] fix in __alloc_bootmem_core() when there is no free page in first node's memory
Hitting BUG_ON() in __alloc_bootmem_core() when there is no free page
available in the first node's memory. For the case of kdump on PPC64
(Power 4 machine), the captured kernel is used two memory regions - memory
for TCE tables (tce-base and tce-size at top of RAM and reserved) and
captured kernel memory region (crashk_base and crashk_size). Since we
reserve the memory for the first node, we should be returning from
__alloc_bootmem_core() to search for the next node (pg_dat).
Currently, find_next_zero_bit() is returning the n^th bit (eidx) when there
is no free page. Then, test_bit() is failed since we set 0xff only for the
actual size initially (init_bootmem_core()) even though rounded up to one
page for bdata->node_bootmem_map. We are hitting the BUG_ON after failing
to enter second "for" loop.
Signed-off-by: Haren Myneni <haren@us.ibm.com>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ff9569bc5558e958777fd43580f2ccd83733cdf6
Author: Yasunori Goto <y-goto@jp.fujitsu.com>
Date: Mon Dec 12 00:37:37 2005 -0800
[PATCH] Fix Kconfig of DMA32 for ia64
I realized ZONE_DMA32 has a trivial bug at Kconfig for ia64. In
include/linux/gfp.h on 2.6.15-rc5-mm1, CONFIG is define like followings.
#ifdef CONFIG_DMA_IS_DMA32
#define __GFP_DMA32 ((__force gfp_t)0x01) /* ZONE_DMA is ZONE_DMA32
*/
:
:
So, CONFIG_"ZONE"_DMA_IS_DMA32 is clearly wrong.
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Cc: "Luck, Tony" <tony.luck@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 1393c3edc307e0a2ec4274f67e342907ffd7deb5
Author: Nicolas Pitre <nico@cam.org>
Date: Mon Dec 12 00:37:36 2005 -0800
[PATCH] input: fix ucb1x00-ts breakage after conversion to dynamic input_dev allocation
The bd622663192e8ebebb27dc1d9397f352a82d2495 commit broke the UCB1x00
touchscreen driver since the idev structure was assumed to be into the ts
structure, simply casting the former to the later in a couple places.
This patch fixes those, and also cache the idev pointer between multiple
calls to input_report_abs() to avoid growing the compiled code needlessly.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Cc: Dmitry Torokhov <dtor_core@ameritech.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 68799398cea44b81d1e919f842d8d84d471053d5
Author: Dave Jones <davej@redhat.com>
Date: Mon Dec 12 00:37:35 2005 -0800
[PATCH] broken cast in parport_pc
Spotted by a Fedora user. Compiling with DEBUG_PARPORT set fails due to
the broken cast.
Just remove it.
Signed-off-by: Dave Jones <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit bf8d5c52c3b6b27061e3b7d779057fd9a6cac164
Author: Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>
Date: Mon Dec 12 00:37:34 2005 -0800
[PATCH] kprobes: increment kprobe missed count for multiprobes
When multiple probes are registered at the same address and if due to some
recursion (probe getting triggered within a probe handler), we skip calling
pre_handlers and just increment nmissed field.
The below patch make sure it walks the list for multiple probes case.
Without the below patch we get incorrect results of nmissed count for
multiple probe case.
Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 00d7c05ab168c10f9b520e07400923267bc04419
Author: Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>
Date: Mon Dec 12 00:37:33 2005 -0800
[PATCH] kprobes: no probes on critical path
For Kprobes critical path is the path from debug break exception handler
till the control reaches kprobes exception code. No probes can be
supported in this path as we will end up in recursion.
This patch prevents this by moving the below function to safe __kprobes
section onto which no probes can be inserted.
Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit cda315aba34ff4fb66bbb2945b723688f3414a75
Author: Matt Domsch <Matt_Domsch@dell.com>
Date: Mon Dec 12 00:37:32 2005 -0800
[PATCH] ipmi: fix panic generator ID
The IPMI specifcation says the generator ID is 0x20, but that is for bits
7-1. Bit 0 is set to specify it is a software event. The correct value is
0x41. Without this fix, panic events written into the System Event Log
appear to come from an "unknown" generator, rather than from the kernel.
Signed-off-by: Jordan Hargrave <Jordan_Hargrave@dell.com>
Signed-off-by: Matt Domsch <Matt_Domsch@dell.com>
Acked-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit dd815408106f3c56c3050493dda97f9355aa4971
Author: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Mon Dec 12 00:37:31 2005 -0800
[PATCH] V4L/DVB: (3151) I2C ID renamed to I2C_DRIVERID_INFRARED
I2C ID renamed to I2C_DRIVERID_INFRARED
Acked-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3639c8619d50a6dea8fa106a5c61d848ffdcd3d6
Author: Sascha Sommer <saschasommer@freenet.de>
Date: Mon Dec 12 00:37:30 2005 -0800
[PATCH] V4L/DVB: (3113) Convert em28xx to use vm_insert_page instead of remap_pfn_range
Convert em28xx to use vm_insert_page instead of remap_pfn_range
Signed-off-by: Sascha Sommer <saschasommer@freenet.de>
Signed-off-by: Michael Krufky <mkrufky@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Cc: Hugh Dickins <hugh@veritas.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 225a0cb6716da3aafaeb9ed2f8d9a7a1f2af9f09
Author: Ricardo Cerqueira <v4l@cerqueira.org>
Date: Mon Dec 12 00:37:28 2005 -0800
[PATCH] V4L/DVB: (3135) Fix tuner init for Pinnacle PCTV Stereo
- The Pinnacle PCTV Stereo needs tda9887 port2 set to 1
- Without this patch, mt20xx tuner is not detected and the board
doesn't tune.
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 674434c691e10015660022fc00b04985a23ef87b
Author: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Mon Dec 12 00:37:28 2005 -0800
[PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 4
Clean up whitespaces at v4l/dvb files
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit afd1a0c9ac281eed3b22b293ccd92af7b0d60889
Author: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Mon Dec 12 00:37:27 2005 -0800
[PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 3
Clean up whitespaces at v4l/dvb files
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 808824b5f73e361503420ee318ca9689781da034
Author: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Mon Dec 12 00:37:25 2005 -0800
[PATCH] V4L/DVB: (3086b) Whitespaces cleanups part 2
Clean up whitespaces at v4l/dvb files
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 9101e6222cb115240e24160bb90cce425bb74de5
Author: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Mon Dec 12 00:37:24 2005 -0800
[PATCH] V4L/DVB: (3086a) Whitespaces cleanups part 1
Clean up whitespaces at v4l/dvb files
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 68352e6ee3675e23b492c51908951058de4f6fe0
Author: Hugh Dickins <hugh@veritas.com>
Date: Mon Dec 12 00:37:23 2005 -0800
[PATCH] mips: setup_zero_pages count 1
Page count should be initialized to 1 on each of the MIPS empty zero pages,
to avoid a bad_page warning whenever one of them is freed from all mappings.
Signed-off-by: Hugh Dickins <hugh@veritas.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7a4ae749a478f8bca73d4b5b8c1b8cbb178b2db5
Author: Pierre Ossman <drzeus@drzeus.cx>
Date: Mon Dec 12 00:37:22 2005 -0800
[PATCH] Add try_to_freeze to kauditd
kauditd was causing suspends to fail because it refused to freeze. Adding
a try_to_freeze() to its sleep loop solves the issue.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Acked-by: Pavel Machek <pavel@suse.cz>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit bf001b26793bd9f8a446577c361226fbcd617182
Author: Pekka J Enberg <penberg@cs.Helsinki.FI>
Date: Mon Dec 12 00:37:16 2005 -0800
[PATCH] uml: fix compile error for tt
arch/um/kernel/tt/uaccess.c: In function `copy_from_user_tt':
arch/um/kernel/tt/uaccess.c:11: error: `FIXADDR_USER_START' undeclared (first use in this
function)
arch/um/kernel/tt/uaccess.c:11: error: (Each undeclared identifier is reported only once
arch/um/kernel/tt/uaccess.c:11: error: for each function it appears in.)
I get the compile error when I disable CONFIG_MODE_SKAS.
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Paolo Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 8140a5005bc6f1c9d0fa103460d50d472e6e3426
Author: John McCutchan <ttb@tentacle.dhs.org>
Date: Mon Dec 12 00:37:14 2005 -0800
[PATCH] inotify: add two inotify_add_watch flags
The below patch lets userspace have more control over the inodes that
inotify will watch. It introduces two new flags.
IN_ONLYDIR -- only watch the inode if it is a directory.
This is needed to avoid the race that can occur when we want to be
sure that we are watching a directory.
IN_DONT_FOLLOW -- don't follow a symlink. In combination
with IN_ONLYDIR we can make sure that we don't watch the target of
symlinks.
The issues the flags fix came up when writing the gnome-vfs inotify
backend. Default behaviour is unchanged.
Signed-off-by: John McCutchan <ttb@tentacle.dhs.org>
Acked-by: Robert Love <rml@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b4788f6d55548e587ced330ece711456f40ec8f1
Author: Jens Axboe <axboe@suse.de>
Date: Mon Dec 12 00:37:13 2005 -0800
[PATCH] cciss: double put_disk()
This undoes the put_disk patch I sent in before.
If I had been paying attention I would have seen that we call put_disk
from free_hba during driver unload. That's the only time we want to
call it. If it's called from deregister disk we may remove the
controller (cNd0) unintentionally.
Signed-off-by: Mike Miller <mike.miller@hp.com>
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit adad0f331f9c693129e81e233c5461e2e7c3e443
Author: Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>
Date: Mon Dec 12 00:37:12 2005 -0800
[PATCH] kprobes: fix race in aggregate kprobe registration
When registering multiple kprobes at the same address, we leave a small
window where the kprobe hlist will not contain a reference to the
registered kprobe, leading to potentially, a system crash if the breakpoint
is hit on another processor.
Patch below now automically relpace the old kprobe with the new
kprobe from the hash list.
Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b88cb42428f14fabdaf947150c00d65891820635
Author: Ingo Molnar <mingo@elte.hu>
Date: Mon Dec 12 00:37:11 2005 -0800
[PATCH] add hlist_replace_rcu()
Add list_replace_rcu: replace old entry by new one.
Signed-off-by: Paul E. McKenney <paulmck@us.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 5650b736ad328f7f3e4120e8790940289b8ac144
Author: Matt Helsley <matthltc@us.ibm.com>
Date: Mon Dec 12 00:37:10 2005 -0800
[PATCH] Add timestamp field to process events
This adds a timestamp field to the events sent via the process event
connector. The timestamp allows listeners to accurately account the
duration(s) between a process' events and offers strong means with which
to determine the order of events with respect to a given task while also
avoiding the addition of per-task data.
This alters the size and layout of the event structure and hence would
break compatibility if process events connector as it stands in 2.6.15-rc2
were released as a mainline kernel.
Signed-off-by: Matt Helsley <matthltc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 64123fd42c7a1e4ebf6acd2399c98caddc7e0c26
Author: Matt Helsley <matthltc@us.ibm.com>
Date: Mon Dec 12 00:37:09 2005 -0800
[PATCH] Add getnstimestamp function
There are several functions that might seem appropriate for a timestamp:
get_cycles()
current_kernel_time()
do_gettimeofday()
<read jiffies/jiffies_64>
Each has problems with combinations of SMP-safety, low resolution, and
monotonicity. This patch adds a new function that returns a monotonic SMP-safe
timestamp with nanosecond resolution where available.
Changes:
Split timestamp into separate patch
Moved to kernel/time.c
Renamed to getnstimestamp
Fixed unintended-pointer-arithmetic bug
Signed-off-by: Matt Helsley <matthltc@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 894ec8707ced240b96dc45944790fb35d9a6b03c
Author: Daniel Drake <dsd@gentoo.org>
Date: Mon Dec 12 00:37:08 2005 -0800
[PATCH] Fix listxattr() for generic security attributes
Commit f549d6c18c0e8e6cf1bf0e7a47acc1daf7e2cec1 introduced a generic
fallback for security xattrs, but appears to include a subtle bug.
Gentoo users with kernels with selinux compiled in, and coreutils compiled
with acl support, noticed that they could not copy files on tmpfs using
'cp'.
cp (compiled with acl support) copies the file, lists the extended
attributes on the old file, copies them all to the new file, and then
exits. However the listxattr() calls were failing with this odd behaviour:
llistxattr("a.out", (nil), 0) = 17
llistxattr("a.out", 0x7fffff8c6cb0, 17) = -1 ERANGE (Numerical result out of
range)
I believe this is a simple problem in the logic used to check the buffer
sizes; if the user sends a buffer the exact size of the data, then its ok
:)
This change solves the problem.
More info can be found at http://bugs.gentoo.org/113138
Signed-off-by: Daniel Drake <dsd@gentoo.org>
Acked-by: James Morris <jmorris@namei.org>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit c3f5902325d3053986e7359f706581d8f032e72f
Author: Srivatsa Vaddagiri <vatsa@in.ibm.com>
Date: Mon Dec 12 00:37:07 2005 -0800
[PATCH] Fix RCU race in access of nohz_cpu_mask
Accessing nohz_cpu_mask before incrementing rcp->cur is racy. It can cause
tickless idle CPUs to be included in rsp->cpumask, which will extend
graceperiods unnecessarily.
Fix this race. It has been tested using extensions to RCU torture module
that forces various CPUs to become idle.
Signed-off-by: Srivatsa Vaddagiri <vatsa@in.ibm.com>
Cc: Dipankar Sarma <dipankar@in.ibm.com>
Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 89d46b8778f65223f732d82c0166e0abba20fb1e
Author: Srivatsa Vaddagiri <vatsa@in.ibm.com>
Date: Mon Dec 12 00:37:06 2005 -0800
[PATCH] Fix bug in RCU torture test
While doing some test of RCU torture module, I hit a OOPS in rcu_do_batch,
which was trying to processes callback of a module that was just removed.
This is because we weren't waiting long enough for all callbacks to fire.
Signed-off-by: Srivatsa Vaddagiri <vatsa@in.ibm.com>
Cc: Dipankar Sarma <dipankar@in.ibm.com>
Acked-by: "Paul E. McKenney" <paulmck@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ab4720ec76b756e1f8705e207a7b392b0453afd6
Author: Dipankar Sarma <dipankar@in.ibm.com>
Date: Mon Dec 12 00:37:05 2005 -0800
[PATCH] add rcu_barrier() synchronization point
This introduces a new interface - rcu_barrier() which waits until all
the RCUs queued until this call have been completed.
Reiser4 needs this, because we do more than just freeing memory object
in our RCU callback: we also remove it from the list hanging off
super-block. This means, that before freeing reiser4-specific portion
of super-block (during umount) we have to wait until all pending RCU
callbacks are executed.
The only change of reiser4 made to the original patch, is exporting of
rcu_barrier().
Cc: Hans Reiser <reiser@namesys.com>
Cc: Vladimir V. Saveliev <vs@namesys.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 85b872424984e79519be904e7df02a91ba0a9486
Author: Andreas Gruenbacher <agruen@suse.de>
Date: Mon Dec 12 00:37:04 2005 -0800
[PATCH] ext3: fix mount options documentation
Reported by Jacques de Mer and Daniel Drake <dsd@gentoo.org>.
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 6b6a462c4ab75c1a5293b22562052cdf0e8bfb22
Author: Andreas Schwab <schwab@suse.de>
Date: Mon Dec 12 00:37:03 2005 -0800
[PATCH] KERNELRELEASE depends on CONFIG_LOCALVERSION
Sam Ravnborg <sam@ravnborg.org> writes:
> Author: Uwe Zeisberger <zeisberg@informatik.uni-freiburg.de>
>
> [PATCH] kbuild: make kernelrelease in unconfigured kernel prints an error
>
> Do not include .config for target kernelrelease
This is wrong. KERNELRELEASE depends on CONFIG_LOCALVERSION, thus you
need .config.
Signed-off-by: Andreas Schwab <schwab@suse.de>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 82584ef75b7c14f22028595b0e8aa904464c5240
Author: Shaohua Li <shaohua.li@intel.com>
Date: Mon Dec 12 00:37:02 2005 -0800
[PATCH] x86: fix NMI with CPU hotplug
With CPU hotplug enabled, NMI watchdog stoped working. It appears the
violation is the cpu_online check in nmi handler. local ACPI based NMI
watchdog is initialized before we set CPU online for APs. It's quite
possible a NMI is fired before we set CPU online, and that's what happens
here.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Acked-by: Zwane Mwaikambo <zwane@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit b3e55c727ff7349c5db722fbdb8d99a151e8e0bf
Author: Mao, Bibo <bibo.mao@intel.com>
Date: Mon Dec 12 00:37:00 2005 -0800
[PATCH] Kprobes: Reference count the modules when probed on it
When a Kprobes are inserted/removed on a modules, the modules must be ref
counted so as not to allow to unload while probes are registered on that
module.
Without this patch, the probed module is free to unload, and when the
probing module unregister the probe, the kpobes code while trying to
replace the original instruction might crash.
Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Signed-off-by: Mao Bibo <bibo.mao@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 3fe968f167975d10c639f03c4934f05a29da73c0
Author: Andrew Morton <akpm@osdl.org>
Date: Mon Dec 12 00:36:59 2005 -0800
[PATCH] blkmtd: use clear_page_dirty()
SetPageDirty() and ClearPageDirty() are low-level thing which filesystems
shouldn't be using. They bypass dirty page accounting.
Cc: David Woodhouse <dwmw2@infradead.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit bf7ececa9b68f4720f1ce344f442435660bcdae7
Author: Keith Owens <kaos@sgi.com>
Date: Sat Dec 10 14:24:28 2005 +1100
[IA64] Define an ia64 version of __raw_read_trylock
IA64 is using the generic version of __raw_read_trylock, which always
waits for the lock to be free instead of returning when the lock is in
use. Define an ia64 version of __raw_read_trylock which behaves
correctly, and drop the generic one.
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 1ee9530a71686436dbeb5f31dd5b925c39cf71d7
Author: Lothar Wassmann <LW@KARO-electronics.de>
Date: Mon Dec 12 16:44:05 2005 +0000
[ARM] 3201/1: PXA27x: Prevent hangup during resume due to inadvertedly enabling MBREQ
(replaces: 3198/1)
Patch from Lothar Wassmann
The patch makes sure, that the ouptut functions of pins are restored
before restoring the Alternat Function settings, preventing pins from
being intermediately configured for undefined or unwanted alternate
functions.
Here is the original comment:
I've got a PXA270 system that uses GPIO80 as nCS4. This system did
hang on resume. Digging into the problem I found that the processor
stalled immediately when restoring the GAFR2_U register which restored
the alternate function for GPIO80. Since the GPDR registers were
restored after the GAFR registers, the offending GPIO was configured
as input at this point.
Thus the alternate function that was in effect after restoring the
GAFR was in fact the input function "MBREQ" instead of the output
function "nCS4". The "PXA27x Processor Family Developer's Manual"
(Footnote in Table 6-1 on page 6-3) states that:
"The MBREQ alternate function must not be enabled until the PSSR[RDH]
bit field is cleared. For more details, see Table 3-15, "PSSR Bit
Definitions" on page 3-71."
There is another note in the Developer's Manual (chapter 24.4.2
"GPIO operation as Alternate Function" on page 24-4)
stating that:
"Configuring a GPIO for an alternate function that is not defined for
it causes unpredictable results."
Since some GPIOs have no input function defined, and to prevent
inadvertedly programming the MBREQ function on some pin, the GAFR
registers should be restored after the GPDR registers have been
restored.
Additional provisions have to be made when the MBREQ function is
actually required. The corresponding GAFR bits should not be restored
with the regular GAFR restore, but must be set only after the PSSR
bits have been cleared.
Signed-off-by: Lothar Wassmann <LW@KARO-electronics.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 67121172f9753f38689651b613a4850e0e75876f
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun Dec 11 20:38:17 2005 -0800
Allow arbitrary read-only shared pfn-remapping too
The VM layer (for historical reasons) turns a read-only shared mmap into
a private-like mapping with the VM_MAYWRITE bit clear. Thus checking
just VM_SHARED isn't actually sufficient.
So use a trivial helper function for the cases where we wanted to inquire
if a mapping was COW-like or not.
Moo!
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 7fc7e2eeecb599ba719c4c4503100fc8cd6a6920
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun Dec 11 19:57:52 2005 -0800
Remove (at least temporarily) the "incomplete PFN mapping" support
With the previous commit, we can handle arbitrary shared re-mappings
even without this complexity, and since the only known private mappings
are for strange users of /dev/mem (which never create an incomplete one),
there seems to be no reason to support it.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit fb155c1619f056ae9765eed272cd6aba6e1a7399
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun Dec 11 19:46:02 2005 -0800
Allow arbitrary shared PFNMAP's
A shared mapping doesn't cause COW-pages, so we don't need to worry
about the whole vm_pgoff logic to decide if a PFN-remapped page has
gone through COW or not.
This makes it possible to entirely avoid the special "partial remapping"
logic for the common case.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit ef969434005e772218c0b8086539804605070fa8
Author: Johannes Berg <johannes@sipsolutions.net>
Date: Sat Dec 10 18:41:50 2005 -0800
[PATCH] ppc32: set smp_tb_synchronized on UP with SMP kernel
ppc32 kernel, when built with CONFIG_SMP and booted on a single CPU
machine, will not properly set smp_tb_synchronized, thus causing
gettimeofday() to not use the HW timebase and to be limited to jiffy
resolution. This, among others, causes unacceptable pauses when launching
X.org.
Signed-Off-By: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit b39f9485e6cfe1bf21b18b60fd8c631a72a1304d
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Mon Dec 12 13:13:24 2005 +1100
[PATCH] powerpc: Fix clock spreading setting on some powermacs
The code that sets the clock spreading feature of the Intrepid ASIC
must not be run on some machine models or those won't boot. This
fixes it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 22f975f4ffa707ea24507f6899bb9f5a1ff034bc
Author: Nikola Valerjev <nikola@ghs.com>
Date: Sat Dec 10 11:59:15 2005 +0000
[ARM] 3200/1: Singlestep over ARM BX and BLX instructions using ptrace fix
Patch from Nikola Valerjev
Single stepping an application using ptrace() fails over ARM instructions BX and BLX.
Steps to reproduce:
Compile and link the following files
main.c
-----
void foo();
int main() {
foo();
return 0;
}
foo.s
-----
.text
.globl foo
foo:
BX LR
Using ptrace() functionality, run to main(), and start singlestepping.
Singlestep over \"BX LR\" instruction won\'t transfer the control back
to main, but run the code to completion.
This problems seems to be in the function get_branch_address() in
arch/arm/kernel/ptrace.c. The function doesn\'t seem to recognize BX
and BLX instructions as branches. BX and BLX instructions can be used
to convert from ARM to Thumb mode if the target address has the low
bit set. However, they are also perfectly legal in the ARM only mode.
Although other things in the kernel seem to indicate that only ARM
mode is accepted (and not Thumb), many compilers will generate BX
and BLX instructions even when generating ARM only code.
Signed-off-by: Nikola Valerjev <nikola@ghs.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit a8c730e85e80734412f4f73ab28496a0e8b04a7b
Author: Jens Axboe <axboe@suse.de>
Date: Fri Dec 9 14:42:16 2005 +0100
[SCSI] fix panic when ejecting ieee1394 ipod
The scsi_library routines don't correctly set DMA_NONE when
req->data_len is zero (instead they check the command type first, so
if it's write, we end up with req->data_len == 0 and direction as
DMA_TO_DEVICE which confuses some drivers)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 73d4f84fd001b0be67fea46e84b75e6a7a5da08e
Author: Kazunori MIYAZAWA <miyazawa@linux-ipv6.org>
Date: Thu Dec 8 23:11:42 2005 -0800
[IPv6] IPsec: fix pmtu calculation of esp
It is a simple bug which uses the wrong member.
This bug does not seriously affect ordinary use of IPsec.
But it is important to pass IPv6 ready logo phase-2
conformance test of IPsec SGW.
Signed-off-by: Kazunori MIYAZAWA <miyazawa@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 23ed6cb9a237902cce6018a24d1993c346abddb4
Author: David Gibson <david@gibson.dropbear.id.au>
Date: Fri Dec 9 16:45:17 2005 +1100
[PATCH] powerpc: Fix SLB flushing path in hugepage
On ppc64, when opening a new hugepage region, we need to make sure any
old normal-page SLBs for the area are flushed on all CPUs. There was
a bug in this logic - after putting the new hugepage area masks into
the thread structure, we copied it into the paca (read by the SLB miss
handler) only on one CPU, not on all. This could cause incorrect SLB
entries to be loaded when a multithreaded program was running
simultaneously on several CPUs. This patch corrects the error,
copying the context information into the PACA on all CPUs using the mm
in question before flushing any existing SLB entries.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit cbf52afdc0eb88492cf7808cc4b4f58a46f1b1ad
Author: David Gibson <david@gibson.dropbear.id.au>
Date: Fri Dec 9 14:20:52 2005 +1100
[PATCH] powerpc: Add missing icache flushes for hugepages
On most powerpc CPUs, the dcache and icache are not coherent so
between writing and executing a page, the caches must be flushed.
Userspace programs assume pages given to them by the kernel are icache
clean, so we must do this flush between the kernel clearing a page and
it being mapped into userspace for execute. We were not doing this
for hugepages, this patch corrects the situation.
We use the same lazy mechanism as we use for normal pages, delaying
the flush until userspace actually attempts to execute from the page
in question.
Tested on G5.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit dabcafd3f363bacd6b89f537af27dc79128e4806
Author: Olof Johansson <olof@lixom.net>
Date: Thu Dec 8 19:40:17 2005 -0600
[PATCH] powerpc: Set cache info defaults
Cache info is setup by walking the device tree in initialize_cache_info().
However, icache_flush_range might be called before that, in
slb_initialize()->patch_slb_encoding, which modifies the load immediate
instructions used with SLB fault code.
Not only that, but depending on memory layout, we might take SLB faults
during unflatten_device_tree. So that fault will load an SLB entry that
might not contain the right LLP flags for the segment.
Either we can walk the flattened device tree to setup cache info, or
we can pick the known defaults that are known to work. Doing it in the
flattened device tree is hairier since we need to know the machine type
to know what property to look for, etc, etc.
For now, it's just easier to go with the defaults. Worst thing that
happens from it is that we might waste a few cycles doing too small
dcbst/icbi increments.
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 326743ead7d0c08e0da715832386660ff3823170
Author: Michal Ostrowski <mostrows@watson.ibm.com>
Date: Thu Dec 8 16:56:17 2005 +1100
[PATCH] Fix windfarm model-id table
model_id fields of wf_smu_sys_all_params should match the model ID
they are supposed to represent (as commented). Fixes windfarm on some
iMac 8,1 models.
Signed-off-by: Michal Ostrowski <mostrows at watson ibm com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 5b35193f5868da5e63f5b4cfe8fbcf9f10fe65cd
Author: Deepak Saxena <dsaxena@plexity.net>
Date: Thu Dec 8 23:34:44 2005 +0000
[ARM] 3199/1: Remove bogus function prototype from arch-pxa/irq.h
Patch from Deepak Saxena
This looks like a leftover from 2.4 days...
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 246a421207007a034da9b8cfa578bc00d16a9553
Author: Stephen Hemminger <shemminger@osdl.org>
Date: Thu Dec 8 15:21:39 2005 -0800
[NET]: Fix NULL pointer deref in checksum debugging.
The problem I was seeing turned out to be that skb->dev is NULL when
the checksum is being completed in user context. This happens because
the reference to the device is dropped (to allow it to be released
when packets are in the queue).
Because skb->dev was NULL, the netdev_rx_csum_fault was panicing on
deref of dev->name. How about this?
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 85631672e6a8032267058b4ccbe53f1924a5d0be
Author: Michael Reed <mdr@sgi.com>
Date: Wed Dec 7 21:46:27 2005 -0600
[SCSI] fix OOPS due to clearing eh_action prior to aborting eh command
The eh_action semaphore in scsi_eh_send_command is cleared after a
command timeout. The command is subsequently aborted and the abort
will try to call scsi_done() on it. Unfortunately, the scsi_eh_done()
routine unconditinally completes the semaphore (which is now null).
Fix this race by makiong the scsi_eh_done() routine check that the
semaphore is non null before completing it (mirroring the ordinary
command done/timeout logic).
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit f0353301e6752399ceb874ede7f44e3571c5e4f3
Author: Mark Lord <lkml@rtr.ca>
Date: Wed Dec 7 17:46:57 2005 -0500
[SCSI] Fix incorrect pointer in megaraid.c MODE_SENSE emulation
The SCSI megaraid drive goes to great effort to kmap
the scatterlist buffer (if used), but then uses the
wrong pointer when copying to it afterward.
Signed-off-by: Mark Lord <lkml@rtr.ca>
Acked by: Ju, Seokmann <Seokmann.Ju@engenio.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 6184b723876cd1a374e2d1094b3c73765d4c31c1
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Dec 8 16:53:34 2005 +1100
[PATCH] powerpc: Remove debug code in hash path
Some debug code wasn't properly removed from the initial 64k pages
patch, and while it's harmless, it's also slowing down significantly a
very hot code path, thus it should really be removed.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 325c82a029ca7ea80f8cb24815d6c9288d177190
Author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Thu Dec 8 16:51:44 2005 +1100
[PATCH] powerpc: Fix a huge page bug
The 64k pages patch changed the meaning of one argument passed to the
low level hash functions (from "large" it became "psize" or page size
index), but one of the call sites wasn't properly updated, causing
potential random weird problems with huge pages. This fixes it.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 6d91bb93e45857259ec80cf7393ea561dba1a1de
Author: Mike Kravetz <kravetz@us.ibm.com>
Date: Wed Dec 7 13:07:23 2005 -0800
[PATCH] powerpc/pseries: boot failures on numa if no memory on node
This bug exists in the current code and prevents machines from booting
with numa enabled if there is a node that does not contain memory.
Workaround is to boot with 'numa=off'. Looks like a simple typo.
Signed-off-by: Mike Kravetz <kravetz@us.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit f64fa6772aa874e5cad02a9d87e6b0d99ced3d48
Author: Christoph Lameter <clameter@engr.sgi.com>
Date: Wed Dec 7 11:24:42 2005 -0800
[IA64] Fix missing parameter for local_add/sub
Local add/sub macros need to have a parameter to specify
the addend/subtrahend respectively.
Signed-off-by: Christoph Lameter <clameter@sgi.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit c2cd6d3c122798c39f63e21e4dd04ee5790010b6
Author: Dave Jones <davej@redhat.com>
Date: Wed Dec 7 18:11:26 2005 +0000
[SERIAL] 8250_pci: Remove redundant assignment, and mark fallthrough.
Signed-off-by: Dave Jones <davej@redhat.com>
commit 0da69df1e54146eece38e0a144051f6dd3526821
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Tue Dec 6 10:58:06 2005 -0800
[SCSI] qla2xxx: Correct short-WRITE status handling.
Properly check FC_RESID for any non-transfered bytes
regardless of firmware completion status.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 23443b1d6130eff8e1335e4f84eaf0577a331dcf
Author: Andrew Vasquez <andrew.vasquez@qlogic.com>
Date: Tue Dec 6 10:57:06 2005 -0800
[SCSI] qla2xxx: Correct mis-handling of AENs.
A regression in a recent change
33135aa2a568ec1a30e734f18e5315e10516e4f3 caused the driver
to mistakenly drop handling of AENs. Due to the incorrect
handling, ports would not reappear after RSCNs and LIPs.
Drops unused/incorrect compound #define from qla_def.h.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit bb58596f6802a4959c2cea02acd272245e671c1d
Author: Dave C Boutcher <sleddog@us.ibm.com>
Date: Tue Nov 15 09:53:00 2005 -0600
[SCSI] ibmvscsi kexec fix
This makes ibmvscsi work correctly with the recent set of kexec
patches that went in. This is based on work by Michael Ellerman, who
chased this initially. He validated that it works during kexec.
Handle kexec correctly in ibmvscsi. During kexec the adapter
will not get cleaned up correctly, so we may need to reset it
to make it sane again.
Signed-off-by: Dave Boutcher <sleddog@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
commit 1f064a87c80c86bd3878e6633de61e8b71aa6788
Author: Stephen Hemminger <shemminger@osdl.org>
Date: Tue Dec 6 17:36:44 2005 -0800
[TG3]: remove warning on race
[ Move assosciated code comment to the correct spot, and
update driver version and release date -DaveM ]
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 4ebf0ae2618fbbb0d365e5d295a30ccfcb91fe0b
Author: David S. Miller <davem@sunset.davemloft.net>
Date: Tue Dec 6 16:38:35 2005 -0800
[AF_PACKET]: Convert PACKET_MMAP over to vm_insert_page().
So we can properly use __GFP_COMP and avoid the use of
PG_reserved pages.
With extremely helpful review from Hugh Dickins.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit dfb4b9dceb35c567a595ae5e9d035cfda044a103
Author: David S. Miller <davem@davemloft.net>
Date: Tue Dec 6 16:24:52 2005 -0800
[TCP] Vegas: timestamp before clone
We have to store the congestion control timestamp on the SKB before we
clone it, not after. Else we get no timestamping information at all.
tcp_transmit_skb() has been reworked so that we can do the timestamp
still in one spot, instead of at all the call sites.
Problem discovered, and initial fix, from Tom Young
<tyo@ee.unimelb.edu.au>.
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 0d7bef600acab393898bd5553e167496587da3e1
Author: Thomas Young <tyo@ee.mu.oz.au>
Date: Tue Dec 6 16:17:11 2005 -0800
[TCP] Vegas: Remove extra call to tcp_vegas_rtt_calc
Remove unneeded call to tcp_vegas_rtt_calc. The more accurate
microsecond value has already been registered prior to calling
tcp_vegas_cong_avoid.
Signed-off-by: Thomas Young <tyo@ee.mu.oz.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 5b4956138173cb8b58d83d3173360e8e681a2b66
Author: Thomas Young <tyo@ee.mu.oz.au>
Date: Tue Dec 6 16:16:34 2005 -0800
[TCP] Vegas: stop resetting rtt every ack
Move the resetting of rtt measurements to inside the once per RTT
block of code.
Signed-off-by: Thomas Young <tyo@ee.mu.oz.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 590711b7dd731bb04e7892c0451566d788985e79
Author: Jack Steiner <steiner@sgi.com>
Date: Tue Dec 6 08:05:24 2005 -0600
[IA64-SGI] Fix SN PTC deadlock recovery
The patch that added support for a new platform chipset (shub2) broke
PTC deadlock recovery on older versions of the chipset. (PTCs are the
SN platform-specific method for doing a global TLB purge). This
patch fixes deadlock recovery so that it works on both the old & new
chipsets.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit bd1d6e2451f2bb0132416fda4d129c4f57a827bc
Author: Robin Holt <holt@sgi.com>
Date: Mon Dec 5 20:02:31 2005 -0600
[IA64] Change SET_PERSONALITY to comply with comment in binfmt_elf.c.
We have a customer application which trips a bug. The problem arises
when a driver attempts to call do_munmap on an area which is mapped, but
because current->thread.task_size has been set to 0xC0000000, the call
to do_munmap fails thinking it is an unmap beyond the user's address
space.
The comment in fs/binfmt_elf.c in load_elf_library() before the call
to SET_PERSONALITY() indicates that task_size must not be changed for
the running application until flush_thread, but is for ia64 executing
ia32 binaries.
This patch moves the setting of task_size from SET_PERSONALITY() to
flush_thread() as indicated. The customer application no longer is able
to trip the bug.
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit acb7f67280128a9ddaa756ff10212391d28caec4
Author: Jack Steiner <steiner@sgi.com>
Date: Mon Dec 5 13:56:50 2005 -0600
[IA64] Limit the maximum NODEDATA_ALIGN() offset
The per-node data structures are allocated with strided offsets that are a
function of the node number. This prevents excessive cache-aliasing from
occurring.
On systems with a large number of nodes, the strided offset becomes
too large. This patch restricts the maximum offset to 32MB. This is far larger
than the size of any current L3 cache.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 3ec829b6895092b0686254c315f42642b4a07efc
Author: John Keller <jpk@sgi.com>
Date: Tue Nov 29 16:36:32 2005 -0600
[IA64-SGI] altix: pci_window fixup
Altix only patch to add fixup code that sets up
pci_controller->window. This code is a temporary
fix until ACPI support on Altix is added.
Also, corrects the usage of pci_dev->sysdata,
which had previously been used to reference
platform specific device info, to now point to
a pci_controller struct.
Signed-off-by: John Keller <jpk@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 92f268e034faf793f6d40de2f0fc81478a14ff39
Author: Stephen Hemminger <shemminger@osdl.org>
Date: Mon Dec 5 11:00:40 2005 -0800
[PATCH] sk98lin: rx checksum offset not set
The checksum offsets for receive offload were not being set correctly.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
commit 1f12bcc9d1840fd26bf577065214f1ebeb2609ba
Author: Steven Whitehouse <steve@chygwyn.com>
Date: Mon Dec 5 13:42:06 2005 -0800
[DECNET]: add memory buffer settings
The patch (originally from Steve) simply adds memory buffer settings to
DECnet similar to those in TCP.
Signed-off-by: Patrick Caulfield <patrick@tykepenguin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit dab9630fb3d206f49658066a3ecf80ea120364db
Author: Martin Waitz <tali@admingilde.org>
Date: Mon Dec 5 13:40:12 2005 -0800
[NET]: make function pointer argument parseable by kernel-doc
When a function takes a function pointer as argument it should use the 'return
(*pointer)(params...)' syntax used everywhere else in the kernel as this is
recognized by kernel-doc.
Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 2fdf1faa8e33082d691bcba18814276f2bd5a6f0
Author: Patrick McHardy <kaber@trash.net>
Date: Mon Dec 5 13:38:16 2005 -0800
[NETFILTER]: Don't use conntrack entry after dropping the reference
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 266c8543480e2202ab63d1d604a5ca049f350cd8
Author: Patrick McHardy <kaber@trash.net>
Date: Mon Dec 5 13:37:33 2005 -0800
[NETFILTER]: Fix unbalanced read_unlock_bh in ctnetlink
NFA_NEST calls NFA_PUT which jumps to nfattr_failure if the skb has no
room left. We call read_unlock_bh at nfattr_failure for the NFA_PUT inside
the locked section, so move NFA_NEST inside the locked section too.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 6636568cf85ef5898a892e90fcc88b61cca9ca27
Author: Patrick McHardy <kaber@trash.net>
Date: Mon Dec 5 13:36:50 2005 -0800
[NETFILTER]: Wait for untracked references in nf_conntrack module unload
Noticed by Pablo Neira <pablo@eurodev.net>.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit a79575633300adb5d3f1bd856cc518c45fefcb86
Author: Patrick McHardy <kaber@trash.net>
Date: Mon Dec 5 13:36:25 2005 -0800
[NETFILTER]: Mark ctnetlink as EXPERIMENTAL
Should have been marked EXPERIMENTAL from the beginning, as the current
bunch of fixes show.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 0be7fa92ca162bf5e7993c392e6f93909d617bbb
Author: Patrick McHardy <kaber@trash.net>
Date: Mon Dec 5 13:34:51 2005 -0800
[NETFILTER]: Fix CTA_PROTO_NUM attribute size in ctnetlink
CTA_PROTO_NUM is a u_int8_t.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit afe5c6bb034bfa5824f8e7def6a739653e8f4655
Author: Patrick McHardy <kaber@trash.net>
Date: Mon Dec 5 13:33:50 2005 -0800
[NETFILTER]: Fix ip_conntrack_flush abuse in ctnetlink
ip_conntrack_flush() used to be part of ip_conntrack_cleanup(), which needs
to drop _all_ references on module unload. Table flushed using ctnetlink
just needs to clean the table and doesn't need to flush the event cache or
wait for any references attached to skbs. Move everything but pure table
flushing back to ip_conntrack_cleanup().
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 3ebbe0cdd41f62e5c79cb4d7aa42a1ca50d7d2f2
Author: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Date: Mon Dec 5 13:33:26 2005 -0800
[NETFILTER]: nfnetlink: Fix calculation of minimum message length
At least, valid nfnetlink message should have nlmsghdr and nfgenmsg.
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>
commit f16c910724250c1af0f53111b4c76505000819f6
Author: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Date: Mon Dec 5 13:32:50 2005 -0800
[NETFILTER]: nf_conntrack: Fix missing check for ICMPv6 type
This makes nf_conntrack_icmpv6 check that ICMPv6 type isn't < 128
to avoid accessing out of array valid_new[] and invmap[].
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>
commit 8d1ca69984ed1e5930c0537b8f606c54007d7319
Author: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon Dec 5 13:32:14 2005 -0800
[NETFILTER]: Fix incorrect argument to ip_nat_initialized() in ctnetlink
ip_nat_initialized() takes enum ip_nat_manip_type as it's second argument,
not a hook number.
Noticed and initial patch by Marcus Sundberg <marcus@ingate.com>.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
commit 05f70395c642bed0300bc1955bfa8c0f93de2bc2
Author: Keith Owens <kaos@sgi.com>
Date: Fri Dec 2 13:40:15 2005 +1100
[IA64] Allow salinfo_decode to detect signals on read
Return -EINTR instead of -ERESTARTSYS when signals are delivered during
a blocked read of /proc/sal/*/event. This allows salinfo_decode to
detect signals when it is blocked on a read of those files.
Signed-off-by: Keith Owens <kaos@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 31a5539e57fa80e877a2f180cd4ec9ce9de6fea0
Author: Hiroki Kaminaga <kaminaga@sm.sony.co.jp>
Date: Mon Dec 5 10:55:00 2005 +0000
[ARM] 3194/1: add pfn_to_kaddr macro for ARM take2
Patch from Hiroki Kaminaga
This patch defines a new macro: pfn_to_kaddr(pfn).
Same macro is already defined on other arch, such as i386.
Signed-off-by: Hiroki Kaminaga <kaminaga@sm.sony.co.jp>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit a0d95af5c28666155ad4c85a63a5065436ae1d79
Author: Deepak Saxena <dsaxena@plexity.net>
Date: Mon Dec 5 10:54:59 2005 +0000
[ARM] 3191/1: Mark I/O pointer as const in __raw_reads[bwl]
Patch from Deepak Saxena
Mark the ioremap'd cookie/pointer in said functions as const since
we should not be actualy touching the data. This fixes a slew of
compile warnings on IXP4xx as our reads[bwl] already mark this
parameter as const.
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit 9ddf61bd09a7668279d2b208a96eba784bec3d80
Author: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Date: Mon Dec 5 10:15:06 2005 +0000
[ARM SMP] mpcore_wdt bogus fpos check
drivers/char/watchdog/mpcore_wdt.c write function contains a check for
(ppos != &file->f_pos). Such check used to make sense when a pointer to
file->f_pos was handed by vfs_write(), not a copy of it as it stands
now.
Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit e781de44153885d5f772731726b4c0c16f8af021
Author: Pierre Ossman <drzeus@drzeus.cx>
Date: Mon Dec 5 10:00:50 2005 +0000
[MMC] Proper check of SCR error code
The routine reading the SCR wasn't paying proper attention to the
error codes returned from the driver.
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit ca507eaf32fa599a92182ce91050046e807a994c
Author: Olof Johansson <olof@lixom.net>
Date: Tue Nov 29 14:04:17 2005 -0600
[PATCH] powerpc: remove redundant code in stab init
There's never been a hardware platform that has both pSeries/RPA LPAR
hypervisor and stab (pre-POWER4 segment management). This removes
the redundant code in stab_initalize().
Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit b6d78157ad129b1bce87cc831d0d038e97ca5551
Author: Paul Mackerras <paulus@samba.org>
Date: Mon Dec 5 14:39:53 2005 +1100
ppc: Build in all three of powermac, PREP and CHRP support
This reverts commit da0825fd201a03294dbf7f8f030676d608da122c, making
it so that if you select CONFIG_PPC_MULTIPLATFORM you get support
for PMAC, PREP and CHRP built in.
The reason for not allowing PMAC, PREP and CHRP to be selected
individually for ARCH=ppc is that there is too much interdependency
between them in the platform support code. For example, CHRP uses
the PMAC nvram code.
Configuring with ARCH=powerpc does allow you to select support for
PMAC and CHRP separately. Support for PREP is not there yet but
should be there soon.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit 6fbb618f5da0424adcba5f666035e4772a8df526
Author: Paul Mackerras <paulus@samba.org>
Date: Mon Dec 5 14:19:10 2005 +1100
powerpc/pseries: Optimize IOMMU setup
The previous commit will use the page-at-a-time hypervisor call for
setting up IOMMU entries when we are using 64k pages and setting up
one 64k page, even though that means 16 calls to the hypervisor, since
the hypervisor still works on 4k pages. This optimizes this case by
using the multi-page IOMMU setup hypervisor call instead.
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit db20da32a22ccfa3a118408034eeb0ba61a42329
Author: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sun Dec 4 17:56:46 2005 +0000
[ARM] Add memory.txt to 00-INDEX
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
commit e4f5c82a92c2a546a16af1614114eec19120e40a
Author: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Date: Sun Dec 4 12:41:54 2005 -0200
[PATCH] V4L/DVB (3087) fix analog NTSC for pcHDTV 3000
- fix analog NTSC for pcHDTV 3000
- Fix regression: broken analog NTSC for DViCO FusionHDTV3 Gold-T
- add tda9887 to card struct, required for both cards.
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
commit 885da19e8044051a92cfd70099398c373245c431
Author: Tony Luck <tony.luck@intel.com>
Date: Fri Dec 2 16:18:42 2005 -0800
[IA64] refresh tiger_defconfig ready for 2.6.15
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit 1448652a54b5de5189a217374706700275b857e6
Author: Robin Holt <holt@sgi.com>
Date: Fri Dec 2 11:14:41 2005 -0600
[IA64] Updates to the sn2_defconfig for 2.6.15.
This updates the sn2_defconfig file for the Altix 330 hardware, enables
the AGP graphics for the SGI Prism, and removes prompts for the remainder
of the new features. Greg Edwards reviewed the changes.
Signed-off-by: Robin Holt <holt@sgi.com>
Signed-off-by: Greg Edwards <edwardsg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
commit e8a167accb47de528d2ffddc0f13f8e84eaa71de
Author: Olaf Hering <olh@suse.de>
Date: Thu Dec 1 21:10:10 2005 +0100
[PATCH] powerpc: correct the NR_CPUS description text
Update the help text to match the allowed range.
Signed-off-by: Olaf Hering <olh@suse.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
commit cc8b5c96a7ac7d695c2887427b1003bd33ec9c97
Author: Michal Ostrowski <mostrows@watson.ibm.com>
Date: Fri Dec 2 13:09:13 2005 +1100
[PATCH] powerpc/pseries: Fix TCE building with 64k pagesize
Must adjust tcenum and npages by TCE_PAGE_FACTOR to convert between
64KB pages and TCE (4K) pages. (This is done in other places, except
for this one location.)
Signed-off-by: Michal Ostrowski <mostrows at watson ibm com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
