commit 265a92856b17524c87da0258ac0d3cec80ae1d35 tree 31ebb3ef3c990ea64a1b93a1785d2abafe8534ec parent 6f5e6b9e69bf043074a0edabe3d271899c34eb79 author Alexey Kuznetsov Fri, 17 Mar 2006 16:05:43 -0800 committer David S. Miller Fri, 17 Mar 2006 16:05:43 -0800 [NET]: Fix race condition in sk_wait_event(). It is broken, the condition is checked out of socket lock. It is wonderful the bug survived for so long time. [ This fixes bugzilla #6233: race condition in tcp_sendmsg when connection became established ] Signed-off-by: David S. Miller commit 6f5e6b9e69bf043074a0edabe3d271899c34eb79 tree 8833d7267d6653a2bf786b055f05640c9a64dc4d parent 7670f023aabd976c25862e4c6fb9f6d9d2758153 author Hugh Dickins Thu, 16 Mar 2006 23:04:09 -0800 committer Linus Torvalds Fri, 17 Mar 2006 07:51:26 -0800 [PATCH] fix free swap cache latency Lee Revell reported 28ms latency when process with lots of swapped memory exits. 2.6.15 introduced a latency regression when unmapping: in accounting the zap_work latency breaker, pte_none counted 1, pte_present PAGE_SIZE, but a swap entry counted nothing at all. We think of pages present as the slow case, but Lee's trace shows that free_swap_and_cache's radix tree lookup can make a lot of work - and we could have been doing it many thousands of times without a latency break. Move the zap_work update up to account swap entries like pages present. This does account non-linear pte_file entries, and unmap_mapping_range skipping over swap entries, by the same amount even though they're quick: but neither of those cases deserves complicating the code (and they're treated no worse than they were in 2.6.14). Signed-off-by: Hugh Dickins Acked-by: Nick Piggin Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7670f023aabd976c25862e4c6fb9f6d9d2758153 tree 13c1c1fe41028f1f4752e10eef1a162b4f38c937 parent 85c6932ef0c7a82c309f8728ddf29768001d794e author Sam Ravnborg Thu, 16 Mar 2006 23:04:08 -0800 committer Linus Torvalds Fri, 17 Mar 2006 07:51:25 -0800 [PATCH] kbuild: fix buffer overflow in modpost Jiri Benc reported that modpost would stop with SIGABRT if used with long filepaths. The error looked like: > Building modules, stage 2. > MODPOST > *** glibc detected *** scripts/mod/modpost: realloc(): invalid next size: +0x0809f588 *** > [...] Fix this by allocating at least the required memory + SZ bytes each time. Before we sometimes ended up allocating too little memory resuting in the glibc detected bug above. Based on patch originally submitted by: Jiri Benc Signed-off-by: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85c6932ef0c7a82c309f8728ddf29768001d794e tree 7f20a727da97fcd891976c5fd3da1ba4ead3f81f parent 5b40dc780ed996162f3af8712eb03beb24dcdbef author Peter Staubach Thu, 16 Mar 2006 23:04:02 -0800 committer Linus Torvalds Fri, 17 Mar 2006 07:51:25 -0800 [PATCH] nfsservctl(): remove user-triggerable printk A user can use nfsservctl() to spam the logs. This can happen because the arguments to the nfsservctl() system call are versioned. This is a good thing. However, when a bad version is detected, the kernel prints a message and then returns an error. Signed-off-by: Peter Staubach Cc: Trond Myklebust Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b40dc780ed996162f3af8712eb03beb24dcdbef tree 17035c1d501390f00efac6895ee663c45d4fb699 parent 8ba32fde2c5be52865b2fd7e5e3752a46971fabe author Christoph Lameter Thu, 16 Mar 2006 23:04:07 -0800 committer Linus Torvalds Fri, 17 Mar 2006 07:51:25 -0800 [PATCH] fix race in pagevec_strip? We can call try_to_release_page() with PagePrivate off and a valid page->mapping This may cause all sorts of trouble for the filesystem *_releasepage() handlers. XFS bombs out in that case. Lock the page before checking for page private. Signed-off-by: Christoph Lameter Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ba32fde2c5be52865b2fd7e5e3752a46971fabe tree 91988d69b76b1d142117b0ed827fc20eb11c9360 parent 82c3c03a4096badd026c6e337f3c5dde020e9ec6 author Kevin Corry Thu, 16 Mar 2006 23:04:03 -0800 committer Linus Torvalds Fri, 17 Mar 2006 07:51:25 -0800 [PATCH] dm stripe: Fix bounds The dm-stripe target currently does not enforce that the size of a stripe device be a multiple of the chunk-size. Under certain conditions, this can lead to I/O requests going off the end of an underlying device. This test-case shows one example. echo "0 100 linear /dev/hdb1 0" | dmsetup create linear0 echo "0 100 linear /dev/hdb1 100" | dmsetup create linear1 echo "0 200 striped 2 32 /dev/mapper/linear0 0 /dev/mapper/linear1 0" | \ dmsetup create stripe0 dd if=/dev/zero of=/dev/mapper/stripe0 bs=1k This will produce the output: dd: writing '/dev/mapper/stripe0': Input/output error 97+0 records in 96+0 records out And in the kernel log will be: attempt to access beyond end of device dm-0: rw=0, want=104, limit=100 The patch will check that the table size is a multiple of the stripe chunk-size when the table is created, which will prevent the above striped device from being created. This should not affect tools like LVM or EVMS, since in all the cases I can think of, striped devices are always created with the sizes being a multiple of the chunk-size. The size of a stripe device must be a multiple of its chunk-size. (akpm: that typecast is quite gratuitous) Signed-off-by: Kevin Corry Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82c3c03a4096badd026c6e337f3c5dde020e9ec6 tree d22aa75410eb3b2bc7865f6dc6ce6c111c103bc9 parent 8532159f5521ba24e697f0d25970ae89ff62a1f2 author Srivatsa Vaddagiri Thu, 16 Mar 2006 23:04:06 -0800 committer Linus Torvalds Fri, 17 Mar 2006 07:51:25 -0800 [PATCH] x86: check for online cpus before bringing them up Bryce reported a bug wherein offlining CPU0 (on x86 box) and then subsequently onlining it resulted in a lockup. On x86, CPU0 is never offlined. The subsequent attempt to online CPU0 doesn't take that into account. It actually tries to bootup the already booted CPU. Following patch fixes the problem (as acknowledged by Bryce). Please consider for inclusion in 2.6.16. Check if cpu is already online. Signed-off-by: Srivatsa Vaddagiri Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8532159f5521ba24e697f0d25970ae89ff62a1f2 tree 38a816eda7461a8c406053a0755efa479e4e3ced parent a0a0c28c1a7109d7955815074c52cac079ab3ba5 author Eric Van Hensbergen Thu, 16 Mar 2006 23:04:04 -0800 committer Linus Torvalds Fri, 17 Mar 2006 07:51:25 -0800 [PATCH] v9fs: fix overzealous dropping of dentry which breaks dcache There is a d_drop in dir_release which caused problems as it invalidates dcache entries too soon. This was likely a part of the wierd cwd behavior folks were seeing. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0a0c28c1a7109d7955815074c52cac079ab3ba5 tree 7b2497a9836f1a3c964cb02b8067af3053524c10 parent 67890d7084085e29c51afa2514036d42643fd3cf author Roman Zippel Thu, 16 Mar 2006 23:04:01 -0800 committer Linus Torvalds Fri, 17 Mar 2006 07:51:25 -0800 [PATCH] posix-timers: fix requeue accounting when signal is ignored When the posix-timer signal is ignored then the timer is rearmed by the callback function. The requeue pending accounting has to be fixed up else the state might be wrong. Signed-off-by: Roman Zippel Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67890d7084085e29c51afa2514036d42643fd3cf tree 2562028768e7236ee70a5954aa45d8922fcbf350 parent 90036ee5938d89638e80f4d0d0700d0f2dbd4a6a author Christoph Lameter Thu, 16 Mar 2006 23:04:00 -0800 committer Linus Torvalds Fri, 17 Mar 2006 07:51:25 -0800 [PATCH] time_interpolator: add __read_mostly The pointer to the current time interpolator and the current list of time interpolators are typically only changed during bootup. Adding __read_mostly takes them away from possibly hot cachelines. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 90036ee5938d89638e80f4d0d0700d0f2dbd4a6a tree de0f9275dcf8a051baf70df8574ce34b8b1f158d parent e0e8eb54d8ae0c4cfd1d297f6351b08a7f635c5f author Christoph Lameter Thu, 16 Mar 2006 23:03:59 -0800 committer Linus Torvalds Fri, 17 Mar 2006 07:51:25 -0800 [PATCH] page migration: Fail with error if swap not setup Currently the migration of anonymous pages will silently fail if no swap is setup. This patch makes page migration functions check for available swap and fail with -ENODEV if no swap space is available. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0e8eb54d8ae0c4cfd1d297f6351b08a7f635c5f tree e6f6442aca13fe9d20d149ed9b414f038d90778f parent 232a347a444e687b5f8cf0f6485704db1c6024d3 author Eric W. Biederman Thu, 16 Mar 2006 10:31:38 -0700 committer Linus Torvalds Fri, 17 Mar 2006 07:46:59 -0800 [PATCH] unshare: Use rcu_assign_pointer when setting sighand The sighand pointer only needs the rcu_read_lock on the read side. So only depending on task_lock protection when setting this pointer is not enough. We also need a memory barrier to ensure the initialization is seen first. Use rcu_assign_pointer as it does this for us, and clearly documents that we are setting an rcu readable pointer. Signed-off-by: Eric W. Biederman Acked-by: Paul E. McKenney Signed-off-by: Linus Torvalds commit 232a347a444e687b5f8cf0f6485704db1c6024d3 tree 7b538d45346c328cd143675c54d043eda25f618c parent c3d7a3a4eb5e8f290d7b1d61430eed1ebedeb936 author Scott Bardone Thu, 16 Mar 2006 19:20:40 -0500 committer Jeff Garzik Thu, 16 Mar 2006 19:20:40 -0500 [netdrvr] fix array overflows in Chelsio driver Adrian Bunk wrote: > The Coverity checker spotted the following two array overflows in > drivers/net/chelsio/sge.c (in both cases, the arrays contain 3 > elements): [snip] This is a bug. The array should contain 2 elements. Here is the fix. Signed-off-by: Scott Bardone Signed-off-by: Jeff Garzik commit c3d7a3a4eb5e8f290d7b1d61430eed1ebedeb936 tree a616111ca9d23e58bb4e2b434216104831a1e186 parent b27a1ed571e12e7ec75b8907bf02fd69fd2bfe10 author David S. Miller Wed, 15 Mar 2006 14:26:28 -0800 committer Jeff Garzik Thu, 16 Mar 2006 19:17:38 -0500 [PATCH] e1000 endianness bugs return -E_NO_BIG_ENDIAN_TESTING; [E1000]: Fix 4 missed endianness conversions on RX descriptor fields. Signed-off-by: David S. Miller Signed-off-by: Jeff Garzik commit b27a1ed571e12e7ec75b8907bf02fd69fd2bfe10 tree e5b305e07c559f92275cbd902bda70aeaeca7346 parent ca68bb1e41c4937fc125d3917dd1feadc493d850 parent 72df16f109b73be37977a26d342e9103e8851cb6 author Jeff Garzik Thu, 16 Mar 2006 19:16:59 -0500 committer Jeff Garzik Thu, 16 Mar 2006 19:16:59 -0500 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit ca68bb1e41c4937fc125d3917dd1feadc493d850 tree 54197e794bd376ceacaea6c8f088f44017f18a7b parent 485ff09990416c75ae9593ddc71619939ab9dd51 parent aa49cdd93be6328113f0c146fc72be173d578d27 author Jeff Garzik Thu, 16 Mar 2006 19:15:26 -0500 committer Jeff Garzik Thu, 16 Mar 2006 19:15:26 -0500 Merge branch 'e100-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6 commit 485ff09990416c75ae9593ddc71619939ab9dd51 tree ca5a5681ba24ca74b296af07d5b4269a9564e60b parent 5466eb5d0ad5e9d4238da71a2a9bd216985a4849 parent 1ae5db3742a0cfaf347231ff0bf181132c64e883 author Linus Torvalds Thu, 16 Mar 2006 09:13:34 -0800 committer Linus Torvalds Thu, 16 Mar 2006 09:13:34 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge: powerpc: update defconfigs [PATCH] powerpc: properly configure DDR/P5IOC children devs [PATCH] powerpc: remove duplicate EXPORT_SYMBOLS [PATCH] powerpc: RTC memory corruption [PATCH] powerpc: enable NAP only on cpus who support it to avoid memory corruption [PATCH] powerpc: Clarify wording for CRASH_DUMP Kconfig option [PATCH] powerpc/64: enable CONFIG_BLK_DEV_SL82C105 [PATCH] powerpc: correct cacheflush loop in zImage powerpc: Fix problem with time going backwards powerpc: Disallow lparcfg being a module commit 1ae5db3742a0cfaf347231ff0bf181132c64e883 tree 0df2e2d2dbdd4c49655b9899da1d04b659b65cb9 parent 92eb4602eb5c37db86cd9d2b1f4c8ca304fbc49f author Paul Mackerras Wed, 15 Mar 2006 16:22:54 +1100 committer Paul Mackerras Thu, 16 Mar 2006 16:55:08 +1100 powerpc: update defconfigs Signed-off-by: Paul Mackerras commit 92eb4602eb5c37db86cd9d2b1f4c8ca304fbc49f tree d6f53b85f0071e914cd1fa5d363259d584f1d3b2 parent 920573bd03bf690135967b5022362d34ede589c3 author John Rose Tue, 14 Mar 2006 17:46:45 -0600 committer Paul Mackerras Thu, 16 Mar 2006 16:55:07 +1100 [PATCH] powerpc: properly configure DDR/P5IOC children devs The dynamic add path for PCI Host Bridges can fail to configure children adapters under P5IOC controllers. It fails to properly fixup bus/device resources, and it fails to properly enable EEH. Both of these steps need to occur before any children devices are enabled in pci_bus_add_devices(). Signed-off-by: John Rose Signed-off-by: Paul Mackerras commit 920573bd03bf690135967b5022362d34ede589c3 tree 93e99ba49fb615c2d16a99c0babc98761a89d57c parent 0e8ed479125a6d246e17cfe6c24e140bfeb01972 author Olaf Hering Tue, 14 Mar 2006 21:21:11 +0100 committer Paul Mackerras Thu, 16 Mar 2006 16:55:05 +1100 [PATCH] powerpc: remove duplicate EXPORT_SYMBOLS remove warnings when building a 64bit kernel. smp_call_function triggers also with 32bit kernel. WARNING: vmlinux: duplicate symbol 'smp_call_function' previous definition was in vmlinux arch/powerpc/kernel/ppc_ksyms.c:164:EXPORT_SYMBOL(smp_call_function); arch/powerpc/kernel/smp.c:300:EXPORT_SYMBOL(smp_call_function); WARNING: vmlinux: duplicate symbol 'ioremap' previous definition was in vmlinux arch/powerpc/kernel/ppc_ksyms.c:113:EXPORT_SYMBOL(ioremap); arch/powerpc/mm/pgtable_64.c:321:EXPORT_SYMBOL(ioremap); WARNING: vmlinux: duplicate symbol '__ioremap' previous definition was in vmlinux arch/powerpc/kernel/ppc_ksyms.c:117:EXPORT_SYMBOL(__ioremap); arch/powerpc/mm/pgtable_64.c:322:EXPORT_SYMBOL(__ioremap); WARNING: vmlinux: duplicate symbol 'iounmap' previous definition was in vmlinux arch/powerpc/kernel/ppc_ksyms.c:118:EXPORT_SYMBOL(iounmap); arch/powerpc/mm/pgtable_64.c:323:EXPORT_SYMBOL(iounmap); Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 0e8ed479125a6d246e17cfe6c24e140bfeb01972 tree cf5ef655ed77c8f7c797e3aab696dbe2e90aedfb parent c6cb3b5f368bae67c0b258cfebc0b9dbd8e1d929 author Michael Neuling Tue, 14 Mar 2006 17:11:51 +1100 committer Paul Mackerras Thu, 16 Mar 2006 16:55:03 +1100 [PATCH] powerpc: RTC memory corruption We should be memset'ing the data we are pointing to, not the pointer itself. This is in an error path so we probably don't hit it much. Signed-off-by: Michael Neuling Signed-off-by: Paul Mackerras commit c6cb3b5f368bae67c0b258cfebc0b9dbd8e1d929 tree e50019d058117bac9530539ada13dc43af99bbcc parent cd9c99d7e5f75e137c2ea0cf693773d63c8d945c author Benjamin Herrenschmidt Sun, 12 Mar 2006 10:55:01 +1100 committer Paul Mackerras Thu, 16 Mar 2006 16:55:02 +1100 [PATCH] powerpc: enable NAP only on cpus who support it to avoid memory corruption This patch fixes incorrect setting of powersave_nap to 1 on all PowerMacs, potentially causing memory corruption on some models. This bug was introuced by me during the 32/64 bits merge. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit cd9c99d7e5f75e137c2ea0cf693773d63c8d945c tree 217101478b3afddc9d163dfea7447caa66216cf6 parent e2c552cc89287e31b0b2472866a69a44b150acd2 author Michael Ellerman Fri, 10 Mar 2006 15:01:08 +1100 committer Paul Mackerras Thu, 16 Mar 2006 16:55:00 +1100 [PATCH] powerpc: Clarify wording for CRASH_DUMP Kconfig option The wording of the CRASH_DUMP Kconfig option is not very clear. It gives you a kernel that can be used _as_ the kdump kernel, not a kernel that can boot into a kdump kernel. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit e2c552cc89287e31b0b2472866a69a44b150acd2 tree 797bd3e1d30a7ac5ad1263da2174a7e7e330b710 parent eacb1962d4594b9d382b40acd73a9c9492718f74 author Olaf Hering Mon, 06 Mar 2006 16:39:25 +0100 committer Paul Mackerras Thu, 16 Mar 2006 16:54:59 +1100 [PATCH] powerpc/64: enable CONFIG_BLK_DEV_SL82C105 Enable the onboard IDE driver for p610, p615 and p630. They have the CD connected to this card. All other RS/6000 systems with this controller have no connectors and dont need this option. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit eacb1962d4594b9d382b40acd73a9c9492718f74 tree aae81be89d85c2bcf6abfca3d86b6ba0379fb39c parent 0a45d4491d0f172e02126370f312405c5d473363 author Olaf Hering Sat, 04 Mar 2006 13:15:40 +0100 committer Paul Mackerras Thu, 16 Mar 2006 16:54:57 +1100 [PATCH] powerpc: correct cacheflush loop in zImage Correct the loop for cacheflush. No idea where I copied the code from, but the original does not work correct. Maybe the flush is not needed. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 0a45d4491d0f172e02126370f312405c5d473363 tree f3f3465d4a24704518e7625334d78add58008b1f parent 82dfdcae0d57c842e02f037758687eef42fb7af6 author Paul Mackerras Wed, 15 Mar 2006 13:47:15 +1100 committer Paul Mackerras Thu, 16 Mar 2006 16:54:55 +1100 powerpc: Fix problem with time going backwards The recent changes to keep gettimeofday in sync with xtime had the side effect that it was occasionally possible for the time reported by gettimeofday to go back by a microsecond. There were two reasons: (1) when we recalculated the offsets used by gettimeofday every 2^31 timebase ticks, we lost an accumulated fractional microsecond, and (2) because the update is done some time after the notional start of jiffy, if ntp is slowing the clock, it is possible to see time go backwards when the timebase factor gets reduced. This fixes it by (a) slowing the gettimeofday clock by about 1us in 2^31 timebase ticks (a factor of less than 1 in 3.7 million), and (b) adjusting the timebase offsets in the rare case that the gettimeofday result could possibly go backwards (i.e. when ntp is slowing the clock and the timer interrupt is late). In this case the adjustment will reduce to zero eventually because of (a). Signed-off-by: Paul Mackerras commit 5466eb5d0ad5e9d4238da71a2a9bd216985a4849 tree ade97b6e34e53ad5611fb1d1ac51a850a81bcec7 parent 2d7f2ea9c989853310c7f6e8be52cc090cc8e66b parent 4333298965cd62585bec891a6a5c9f4c806fc6bd author Linus Torvalds Wed, 15 Mar 2006 18:17:11 -0800 committer Linus Torvalds Wed, 15 Mar 2006 18:17:11 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 3362/1: [cleanup] - duplicate decleration of mem_fclk_21285 [ARM] 3365/1: [cleanup] header for compat.c exported functions [ARM] 3364/1: [cleanup] warning fix - definitions for enable_hlt and disable_hlt [ARM] 3363/1: [cleanup] process.c - fix warnings [ARM] 3358/1: [S3C2410] add missing SPI DMA resources [ARM] 3357/1: enable frontlight on collie [ARM] Fix "thead" typo commit 2d7f2ea9c989853310c7f6e8be52cc090cc8e66b tree a4fab82e393dc525c1f5d7549c0cbd6758e7523e parent f13b83580acef03a36c785dccc534ccdd7e43084 author Al Viro Wed, 15 Mar 2006 21:41:59 +0000 committer Linus Torvalds Wed, 15 Mar 2006 16:31:51 -0800 [PATCH] Fix ext2 readdir f_pos re-validation logic This fixes not one, but _two_, silly (but admittedly hard to hit) bugs in the ext2 filesystem "readdir()" function. It also cleans up the code to avoid the unnecessary goto mess. The bugs were related to re-valiating the f_pos value after somebody had either done an "lseek()" on the directory to an invalid offset, or when the offset had become invalid due to a file being unlinked in the directory. The code would not only set the f_version too eagerly, it would also not update f_pos appropriately for when the offset fixup took place. When that happened, we'd occasionally subsequently fail the readdir() even when we shouldn't (no real harm done, but an ugly printk, and obviously you would end up not necessarily seeing all entries). Thanks to Masoud Sharbiani who noticed the problem and had a test-case for it, and also fixed up a thinko in the first version of this patch. Signed-off-by: Al Viro Acked-by: Masoud Sharbiani Signed-off-by: Linus Torvalds commit 4333298965cd62585bec891a6a5c9f4c806fc6bd tree 01d739ed0e13c814f40ae38f6176f6feafc1f6b4 parent 0fc1c832123493aca4c6a8600179132651f48bdc author Ben Dooks Wed, 15 Mar 2006 23:18:08 +0000 committer Russell King Wed, 15 Mar 2006 23:18:08 +0000 [ARM] 3362/1: [cleanup] - duplicate decleration of mem_fclk_21285 Patch from Ben Dooks arch/arm/kernel/setup.c declares mem_fclk_21285 when this is already declared in include/asm-arm/system.h Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 0fc1c832123493aca4c6a8600179132651f48bdc tree 08f0d346bbd9d55ef9cf9e965ea3bdfb76aa423d parent dabaeff06cca86048cfa3f74ce59688bc3addba9 author Ben Dooks Wed, 15 Mar 2006 23:17:30 +0000 committer Russell King Wed, 15 Mar 2006 23:17:30 +0000 [ARM] 3365/1: [cleanup] header for compat.c exported functions Patch from Ben Dooks arch/arm/kernel/compat.c exports two functions, convert_to_tag_list and squash_mem_tags which are not defined in any header files, and not used outside arch/arm/kernel. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit dabaeff06cca86048cfa3f74ce59688bc3addba9 tree 58fbe5c7cf2770f529b7b01c7823e295f2aba632 parent 84dff1a73013dbdd7d770c332ab84cbfed24741b author Ben Dooks Wed, 15 Mar 2006 23:17:26 +0000 committer Russell King Wed, 15 Mar 2006 23:17:26 +0000 [ARM] 3364/1: [cleanup] warning fix - definitions for enable_hlt and disable_hlt Patch from Ben Dooks The enable_hlt and disable_hlt should be declared in include/asm/setup.h. This fixes sparse errors from arch/arm/kernel/process.c Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 84dff1a73013dbdd7d770c332ab84cbfed24741b tree af4fdd8f5285498d7952a76b0a4dc6d909e43207 parent 66be0c30282bef9ef5ab1f89028834ea00f4b4ae author Ben Dooks Wed, 15 Mar 2006 23:17:23 +0000 committer Russell King Wed, 15 Mar 2006 23:17:23 +0000 [ARM] 3363/1: [cleanup] process.c - fix warnings Patch from Ben Dooks Fix the following warnings from sparse: arch/arm/kernel/process.c:86:6: warning: symbol 'default_idle' was not declared. Should it be static? arch/arm/kernel/process.c:378:5: warning: symbol 'dump_fpu' was not declared. Should it be static? Include for dump_fpu() decleration, and make default_idle() static as it is not used outside the file. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 72df16f109b73be37977a26d342e9103e8851cb6 tree 612e08a13421387f7b82a9c89d2f9b38f711630c parent 0df7861240b3484dea52d1f5782c69fd95b6cf23 author Hong Liu Wed, 08 Mar 2006 10:50:20 +0800 committer John W. Linville Wed, 15 Mar 2006 16:16:07 -0500 [PATCH] ieee80211: Fix QoS is not active problem Fix QoS is not active even the network and the card is QOS enabled. The problem is we pass the wrong ieee80211_network address to ipw_handle_beacon/ipw_handle_probe_response, thus the ieee80211_network->qos_data.active will not be set, causing the driver not sending QoS frames at all. Signed-off-by: Hong Liu Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 0df7861240b3484dea52d1f5782c69fd95b6cf23 tree 5de4228d09da99a352b125692f4c3aa3402103c9 parent f13b83580acef03a36c785dccc534ccdd7e43084 author Zhu Yi Tue, 28 Feb 2006 15:10:36 +0800 committer John W. Linville Wed, 15 Mar 2006 16:11:55 -0500 [PATCH] ieee80211: Fix CCMP decryption problem when QoS is enabled Use the correct STYPE for Qos data. Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit aa49cdd93be6328113f0c146fc72be173d578d27 tree 38346543e8567d031749f220bc9ba76d8352361b parent f13b83580acef03a36c785dccc534ccdd7e43084 author Jesse Brandeburg Wed, 15 Mar 2006 10:55:24 -0800 committer Jesse Brandeburg Wed, 15 Mar 2006 10:55:24 -0800 e100: fix eeh on pseries during ethtool -t Olaf Hering reported a problem on pseries with e100 where ethtool -t would cause a bus error, and the e100 driver would stop working. Due to the new load ucode command the cb list must be allocated before calling e100_init_hw, so remove the call and just let e100_up take care of it. Signed-off-by: Jesse Brandeburg commit f13b83580acef03a36c785dccc534ccdd7e43084 tree 1252d76d1e36602024c6dcf0c9afc5688e7bde85 parent 74c002410548c7cb1744b45d17a5fa21da515b63 author Adrian Bunk Wed, 15 Mar 2006 17:37:32 +0100 committer Linus Torvalds Wed, 15 Mar 2006 09:37:34 -0800 [PATCH] fs/namespace.c:dup_namespace(): fix a use after free The Coverity checker spotted the following bug in dup_namespace(): <-- snip --> if (!new_ns->root) { up_write(&namespace_sem); kfree(new_ns); goto out; } ... out: return new_ns; <-- snip --> Callers expect a non-NULL result to not be freed. Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 66be0c30282bef9ef5ab1f89028834ea00f4b4ae tree a61cd268be2ae2c7b7afb7db24efb4ee39b0833d parent 4ebf2d00260bac5213c5dfb8d257e15e40503725 author Albrecht Dreß Wed, 15 Mar 2006 16:03:05 +0000 committer Russell King Wed, 15 Mar 2006 16:03:05 +0000 [ARM] 3358/1: [S3C2410] add missing SPI DMA resources Patch from Albrecht Dreß Add DMA resources to s3c2410 spi platform devices - dma_(alloc|free)_coherent should now work as expected. Signed-off-by: Albrecht Dreß Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 4ebf2d00260bac5213c5dfb8d257e15e40503725 tree f2df0561bb029d54dd19716b14468063b6d886f9 parent 17320a9644a45ccac51ce4ff4333276844abf72d author Pavel Machek Wed, 15 Mar 2006 16:03:03 +0000 committer Russell King Wed, 15 Mar 2006 16:03:03 +0000 [ARM] 3357/1: enable frontlight on collie Patch from Pavel Machek Enable frontlight during collie bootup, so that display is actually readable in anything other than bright sunlight. Signed-off-by: Pavel Machek Signed-off-by: Richard Purdie Signed-off-by: Russell King commit 17320a9644a45ccac51ce4ff4333276844abf72d tree cab05e7855ca9a1dd70963846c6f319ac8ff5480 parent 74c002410548c7cb1744b45d17a5fa21da515b63 author Russell King Wed, 15 Mar 2006 14:57:13 +0000 committer Russell King Wed, 15 Mar 2006 14:57:13 +0000 [ARM] Fix "thead" typo Signed-off-by: Russell King commit 74c002410548c7cb1744b45d17a5fa21da515b63 tree d83774ce92907ecaf450998ddaf865836fde00ea parent b4fb376628e63bfc8071fc915b921da3db4a3385 author Christoph Lameter Tue, 14 Mar 2006 19:50:21 -0800 committer Linus Torvalds Tue, 14 Mar 2006 21:43:02 -0800 [PATCH] Consistent capabilites associated with MPOL_MOVE_ALL It seems that setting scheduling policy and priorities is also the kind of thing that might be performed in apps that also use the NUMA API, so it would seem consistent to use CAP_SYS_NICE for NUMA also. So use CAP_SYS_NICE for controlling migration permissions. Signed-off-by: Christoph Lameter Cc: Michael Kerrisk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4fb376628e63bfc8071fc915b921da3db4a3385 tree 01863773f7d48792072b2a49aba9fa78df39eecc parent 4983da07f1e2e8dc81cb9d640fbf35b899cdbdf2 author Christoph Lameter Tue, 14 Mar 2006 19:50:20 -0800 committer Linus Torvalds Tue, 14 Mar 2006 21:43:02 -0800 [PATCH] Page migration documentation update Update the documentation for page migration. - Fix up bits and pieces in cpusets.txt - Rework text in vm/page-migration to be clearer and reflect the final version of page migration in 2.6.16. Mention Andi Kleen's numactl package that contains user space tools for page migration via libnuma. Add reference to numa_maps and to the manpage in numactl. - Add todo list for outstanding issues Signed-off-by: Christoph Lameter Acked-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4983da07f1e2e8dc81cb9d640fbf35b899cdbdf2 tree 9c238114f029d1d22bc55f47e8d95ef7335c540d parent e843e280cbe218fc8387339806d344708dee348a author Christoph Lameter Tue, 14 Mar 2006 19:50:19 -0800 committer Linus Torvalds Tue, 14 Mar 2006 21:43:02 -0800 [PATCH] page migration: fail if page is in a vma flagged VM_LOCKED page migration currently simply retries a couple of times if try_to_unmap() fails without inspecting the return code. However, SWAP_FAIL indicates that the page is in a vma that has the VM_LOCKED flag set (if ignore_refs ==1). We can check for that return code and avoid retrying the migration. migrate_page_remove_references() now needs to return a reason why the failure occured. So switch migrate_page_remove_references to use -Exx style error messages. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e843e280cbe218fc8387339806d344708dee348a tree ca40d7016db511cfaf3001e799a0f2693882270a parent 0ee10a4423f6eb0702a71c1d1072bdfe42e4a1a7 author Greg Smith Tue, 14 Mar 2006 19:50:17 -0800 committer Linus Torvalds Tue, 14 Mar 2006 21:43:02 -0800 [PATCH] "s390: multiple subchannel sets support" fix It seems this patch got dropped (it was in addition to the `s390: improve response code handling in chsc_enable_facility()' patch). Acked-by: Cornelia Huck Cc: Martin Schwidefsky Cc: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ee10a4423f6eb0702a71c1d1072bdfe42e4a1a7 tree ff1fc7b27da098ebe46f292bdf9f60c0bf373875 parent a488edc914aa1d766a4e2c982b5ae03d5657ec1b parent 3fb962bde48c413bfa419ec4413037e87955dcb6 author Linus Torvalds Tue, 14 Mar 2006 20:50:45 -0800 committer Linus Torvalds Tue, 14 Mar 2006 20:50:45 -0800 Merge git://oss.sgi.com:8090/oss/git/rc-fixes * git://oss.sgi.com:8090/oss/git/rc-fixes: Fix a direct I/O locking issue revealed by the new mutex code. commit 3fb962bde48c413bfa419ec4413037e87955dcb6 tree ccce49b3fbdd8a3f38bbfd07a397092a3ae483b5 parent 3759fa9c55923f719ae944a3f8fbb029b36f759d author Nathan Scott Wed, 15 Mar 2006 15:14:45 +1100 committer Nathan Scott Wed, 15 Mar 2006 15:14:45 +1100 Fix a direct I/O locking issue revealed by the new mutex code. Affects only XFS (i.e. DIO_OWN_LOCKING case) - currently it is not possible to get i_mutex locking correct when using DIO_OWN direct I/O locking in a filesystem due to indeterminism in the possible return code/lock/unlock combinations. This can cause a direct read to attempt a double i_mutex unlock inside XFS. We're now ensuring __blockdev_direct_IO always exits with the inode i_mutex (still) held for a direct reader. Tested with the three different locking modes (via direct block device access, ext3 and XFS) - both reading and writing; cannot find any regressions resulting from this change, and it clearly fixes the mutex_unlock warning originally reported here: http://marc.theaimsgroup.com/?l=linux-kernel&m=114189068126253&w=2 Signed-off-by: Nathan Scott Acked-by: Christoph Hellwig commit a488edc914aa1d766a4e2c982b5ae03d5657ec1b tree f31e123b8d979d5a01260cbfa12ba2052254df85 parent 0f511ea70600efb1e06d7b55e1c51a83aff8713c author Dave Kleikamp Tue, 14 Mar 2006 13:44:00 -0600 committer Linus Torvalds Tue, 14 Mar 2006 14:00:48 -0800 [PATCH] JFS: Take logsync lock before testing mp->lsn This fixes a race where lsn could be cleared before taking the lock Signed-off-by: Dave Kleikamp Signed-off-by: Linus Torvalds commit 0f511ea70600efb1e06d7b55e1c51a83aff8713c tree aff23d774e17528c27c57b949c5a60aa5c464dbf parent 67963132638e67ad3c5aa16765e6f3f2f3cdd85c parent ad58f7dbeb6f5ea82679962f18985f16b660a2d9 author Linus Torvalds Tue, 14 Mar 2006 11:03:50 -0800 committer Linus Torvalds Tue, 14 Mar 2006 11:03:50 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] zfcp: fix device registration issues [SCSI] scsi_transport_fc: fix FC_HOST_NUM_ATTRS [SCSI] scsi: aha152x pcmcia driver needs spi transport [SCSI] zfcp: correctly set this_id for hosts [SCSI] Add Brownie to blacklist commit 67963132638e67ad3c5aa16765e6f3f2f3cdd85c tree 799409dacd6f604d6500bac693da5cb3fafb71cb parent cbf0ec6ee001ab89471397ac84105b2e3b2fd986 author Maneesh Soni Tue, 14 Mar 2006 15:03:14 +0530 committer Linus Torvalds Tue, 14 Mar 2006 08:26:44 -0800 [PATCH] Plug kdump shutdown race window lapic_shutdown() re-enables interrupts which is un-desirable for panic case, so use local_irq_save() and local_irq_restore() to keep the irqs disabled for kexec on panic case, and close a possible race window while kdump shutdown as shown in this stack trace -- BUG: spinlock lockup on CPU#1, bash/4396, c52781a0 [] _raw_spin_lock+0xb7/0xd2 [] _spin_lock+0x6/0x8 [] scheduler_tick+0xe7/0x328 [] update_process_times+0x51/0x5d [] smp_apic_timer_interrupt+0x4f/0x58 [] lapic_shutdown+0x76/0x7e [] apic_timer_interrupt+0x1c/0x30 [] lapic_shutdown+0x76/0x7e [] machine_crash_shutdown+0x83/0xaa [] crash_kexec+0xc1/0xe3 [] _spin_lock+0x6/0x8 [] crash_kexec+0xad/0xe3 [] __handle_sysrq+0x84/0xfd [] write_sysrq_trigger+0x2c/0x35 [] vfs_write+0xa2/0x13b [] sys_write+0x3b/0x64 [] syscall_call+0x7/0xb Signed-off-by: Maneesh Soni Signed-off-by: Linus Torvalds commit cbf0ec6ee001ab89471397ac84105b2e3b2fd986 tree c5962763cc47cc36b4c1ff1c4c56b96b256a4657 parent ceb2ca9cb0bfd885127fa9a2c27127b3fe1c8f28 author Linus Torvalds Tue, 14 Mar 2006 08:01:47 -0800 committer Linus Torvalds Tue, 14 Mar 2006 08:01:47 -0800 Revert "[PATCH] x86-64: Fix up handling of non canonical user RIPs" This reverts commit c33d4568aca9028a22857f94f5e0850012b6444b. Andrew Clayton and Hugh Dickins report that it's broken for them and causes strange page table and slab corruption, and spontaneous reboots. Let's get it right next time. Cc: Andrew Clayton Cc: Hugh Dickins Cc: Andi Kleen Signed-off-by: Linus Torvalds commit ceb2ca9cb0bfd885127fa9a2c27127b3fe1c8f28 tree 3538a1d7f63c2ce8549958c95683e1e2922db7e3 parent 30f4e20a0d3492668f5065af582b5af2d1e4256b author Dave Peterson Mon, 13 Mar 2006 21:20:50 -0800 committer Linus Torvalds Tue, 14 Mar 2006 07:57:18 -0800 [PATCH] EDAC: disable sysfs interface - Disable the EDAC sysfs code. The sysfs interface that EDAC presents to user space needs more thought, and is likely to change substantially. Therefore disable it for now so users don't start depending on it in its current form. - Disable the default behavior of calling panic() when an uncorrectible error is detected (since for now, there is no sysfs interface that allows the user to configure this behavior). Signed-off-by: David S. Peterson Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30f4e20a0d3492668f5065af582b5af2d1e4256b tree 518b47635c091814b35caf128f7be361c595aab1 parent e6d83d55698b73b4d5d55d3d7715a4c26030d577 author Trond Myklebust Mon, 13 Mar 2006 21:20:49 -0800 committer Linus Torvalds Tue, 14 Mar 2006 07:57:18 -0800 [PATCH] NLM: Ensure we do not Oops in the case of an unlock In theory, NLM specs assure us that the server will only reply LCK_GRANTED or LCK_DENIED_GRACE_PERIOD to our NLM_UNLOCK request. In practice, we should not assume this to be the case, and the code will currently Oops if we do. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6d83d55698b73b4d5d55d3d7715a4c26030d577 tree b2c0e3a799444d9c25c00cf34975b456e0c9ef9d parent c12e87f4652b1ba3be168b4f63a440399b941928 author Trond Myklebust Mon, 13 Mar 2006 21:20:48 -0800 committer Linus Torvalds Tue, 14 Mar 2006 07:57:18 -0800 [PATCH] SUNRPC: Fix potential deadlock in RPC code In rpc_wake_up() and rpc_wake_up_status(), it is possible for the call to __rpc_wake_up_task() to fail if another thread happens to be calling rpc_wake_up_task() on the same rpc_task. Problem noticed by Bruno Faccini. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c12e87f4652b1ba3be168b4f63a440399b941928 tree aa8c0ca6a6ea60042975d1ec9437620269df0182 parent 712917d1c002f820b177683f4fd491289bde3c32 author Trond Myklebust Mon, 13 Mar 2006 21:20:47 -0800 committer Linus Torvalds Tue, 14 Mar 2006 07:57:18 -0800 [PATCH] NFSv4: fix mount segfault on errors returned that are < -1000 It turns out that nfs4_proc_get_root() may return raw NFSv4 errors instead of mapping them to kernel errors. Problem spotted by Neil Horman Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 712917d1c002f820b177683f4fd491289bde3c32 tree 059c7a9871803d8d5b4673d92bf21a9ae7738c8b parent 143f412eb4c7cc48b9eb4381f9133b7d36c68075 author Adrian Bunk Mon, 13 Mar 2006 21:20:47 -0800 committer Linus Torvalds Tue, 14 Mar 2006 07:57:17 -0800 [PATCH] SUNRPC: fix a NULL pointer dereference in net/sunrpc/clnt.c The Coverity checker spotted this possible NULL pointer dereference in rpc_new_client(). Signed-off-by: Adrian Bunk Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 143f412eb4c7cc48b9eb4381f9133b7d36c68075 tree 383c140bf7879c77781d4aa113e517a92f16991d parent f9a3879abf2f1a27c39915e6074b8ff15a24cb55 author Trond Myklebust Mon, 13 Mar 2006 21:20:46 -0800 committer Linus Torvalds Tue, 14 Mar 2006 07:57:17 -0800 [PATCH] NFS: Fix a potential panic in O_DIRECT Based on an original patch by Mike O'Connor and Greg Banks of SGI. Mike states: A normal user can panic an NFS client and cause a local DoS with 'judicious'(?) use of O_DIRECT. Any O_DIRECT write to an NFS file where the user buffer starts with a valid mapped page and contains an unmapped page, will crash in this way. I haven't followed the code, but O_DIRECT reads with similar user buffers will probably also crash albeit in different ways. Details: when nfs_get_user_pages() calls get_user_pages(), it detects and correctly handles get_user_pages() returning an error, which happens if the first page covered by the user buffer's address range is unmapped. However, if the first page is mapped but some subsequent page isn't, get_user_pages() will return a positive number which is less than the number of pages requested (this behaviour is sort of analagous to a short write() call and appears to be intentional). nfs_get_user_pages() doesn't detect this and hands off the array of pages (whose last few elements are random rubbish from the newly allocated array memory) to it's caller, whence they go to nfs_direct_write_seg(), which then totally ignores the nr_pages it's given, and calculates its own idea of how many pages are in the array from the user buffer length. Needless to say, when it comes to transmit those uninitialised page* pointers, we see a crash in the network stack. Signed-off-by: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9a3879abf2f1a27c39915e6074b8ff15a24cb55 tree 67a133c1957e992ee10f8d33e312616f494d7b07 parent 63e1fd41c7127650d355e7db7dd92890edf5523b author GOTO Masanori Mon, 13 Mar 2006 21:20:44 -0800 committer Linus Torvalds Tue, 14 Mar 2006 07:57:17 -0800 [PATCH] Fix sigaltstack corruption among cloned threads This patch fixes alternate signal stack corruption among cloned threads with CLONE_SIGHAND (and CLONE_VM) for linux-2.6.16-rc6. The value of alternate signal stack is currently inherited after a call of clone(... CLONE_SIGHAND | CLONE_VM). But if sigaltstack is set by a parent thread, and then if multiple cloned child threads (+ parent threads) call signal handler at the same time, some threads may be conflicted - because they share to use the same alternative signal stack region. Finally they get sigsegv. It's an undesirable race condition. Note that child threads created from NPTL pthread_create() also hit this conflict when the parent thread uses sigaltstack, without my patch. To fix this problem, this patch clears the child threads' sigaltstack information like exec(). This behavior follows the SUSv3 specification. In SUSv3, pthread_create() says "The alternate stack shall not be inherited (when new threads are initialized)". It means that sigaltstack should be cleared when sigaltstack memory space is shared by cloned threads with CLONE_SIGHAND. Note that I chose "if (clone_flags & CLONE_SIGHAND)" line because: - If clone_flags line is not existed, fork() does not inherit sigaltstack. - CLONE_VM is another choice, but vfork() does not inherit sigaltstack. - CLONE_SIGHAND implies CLONE_VM, and it looks suitable. - CLONE_THREAD is another candidate, and includes CLONE_SIGHAND + CLONE_VM, but this flag has a bit different semantics. I decided to use CLONE_SIGHAND. [ Changed to test for CLONE_VM && !CLONE_VFORK after discussion --Linus ] Signed-off-by: GOTO Masanori Cc: Roland McGrath Cc: Ingo Molnar Acked-by: Linus Torvalds Cc: Ulrich Drepper Cc: Jakub Jelinek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63e1fd41c7127650d355e7db7dd92890edf5523b tree 7830390fb26a1b2e69b4e98eddc5f73683decd1d parent 6acaba8e22bb355409e06d9e7ce4e7bef1bcaa04 author Benjamin Herrenschmidt Mon, 13 Mar 2006 21:20:42 -0800 committer Linus Torvalds Tue, 14 Mar 2006 07:57:17 -0800 [PATCH] macintosh: correct AC Power info in /proc/pmu/info Report AC Power present in /proc/pmu/info if there is no battery. Signed-off-by: Olaf Hering Signed-off-by: Benjamin Herrenschmidt , Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6acaba8e22bb355409e06d9e7ce4e7bef1bcaa04 tree c5c4aaafb6bf8fe51f0dd060dc9ce5fd7c779892 parent 3cb4f09fc2e98bbf26f8c900a94bf3910cd4d823 author Michael Hunold Mon, 13 Mar 2006 21:20:41 -0800 committer Linus Torvalds Tue, 14 Mar 2006 07:57:17 -0800 [PATCH] Restore tuning capabilities in V4L2 MXB driver The behaviour of the all-in-one Video4Linux tuner driver apparently changed. It now wants to know the tv standard, otherwise it refuses to tune. Restore tuning functionality in my driver for the "Multimedia eXtension Board". The all-in-one tuner driver apparently changed its behaviour. Signed-off-by: Michael Hunold Cc: Mauro Carvalho Chehab Cc: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3cb4f09fc2e98bbf26f8c900a94bf3910cd4d823 tree 3b0c652fedc40b673bf533f452dee83169655073 parent 3759fa9c55923f719ae944a3f8fbb029b36f759d author David Brownell Mon, 13 Mar 2006 21:20:40 -0800 committer Linus Torvalds Tue, 14 Mar 2006 07:57:17 -0800 [PATCH] mtd_dataflash, fix block vs page erase Fix a bug in the block-erase optimization for Dataflash; it was using block erase even for smaller segments that need page erase. That wouldn't matter for JFFS2, which never erases less than one block (sometimes several blocks), but for other callers it might. Signed-off-by: David Brownell Acked-by: David Woodhouse Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82dfdcae0d57c842e02f037758687eef42fb7af6 tree fd951ffec0202970f15ea35fa463ea492531239d parent 3759fa9c55923f719ae944a3f8fbb029b36f759d author Paul Mackerras Tue, 14 Mar 2006 11:35:37 +1100 committer Paul Mackerras Tue, 14 Mar 2006 11:35:37 +1100 powerpc: Disallow lparcfg being a module The lparcfg code needs several things which are pretty arcane internal details and which we don't want to export, which means that lparcfg doesn't work when built as a module. This makes it a bool instead of a tristate in the Kconfig so that users can't try to build it as a module. Signed-off-by: Paul Mackerras commit 3759fa9c55923f719ae944a3f8fbb029b36f759d tree ca48147798cd6a02edf64290dcf14c7681ab88cc parent c33d4568aca9028a22857f94f5e0850012b6444b author Herbert Xu Mon, 13 Mar 2006 14:26:12 -0800 committer David S. Miller Mon, 13 Mar 2006 14:26:12 -0800 [TCP]: Fix zero port problem in IPv6 When we link a socket into the hash table, we need to make sure that we set the num/port fields so that it shows us with a non-zero port value in proc/netlink and on the wire. This code and comment is copied over from the IPv4 stack as is. Signed-off-by: Herbert Xu commit c33d4568aca9028a22857f94f5e0850012b6444b tree 7a33d918e4d35b0444820595cb2aaaae1f1f5bfa parent 31fe4d331729e9687db84521c3ceb8e43390efcf author Andi Kleen Sun, 12 Mar 2006 23:52:59 +0100 committer Linus Torvalds Sun, 12 Mar 2006 22:56:29 -0800 [PATCH] x86-64: Fix up handling of non canonical user RIPs EM64T CPUs have somewhat weird error reporting for non canonical RIPs in SYSRET. We can't handle any exceptions there because the exception handler would end up running on the user stack which is unsafe. To avoid problems any code that might end up with a user touched pt_regs should return using int_ret_from_syscall. int_ret_from_syscall ends up using IRET, which allows safe exceptions. Cc: Ernie Petrides Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 31fe4d331729e9687db84521c3ceb8e43390efcf tree 3db1ef1a3daaf10d01ab18dbcc0f107857919eac parent baa829d8926f02ab04be6ec37780810d221c5b4b author Patrick McHardy Sun, 12 Mar 2006 20:40:43 -0800 committer David S. Miller Sun, 12 Mar 2006 20:40:43 -0800 [NETFILTER]: arp_tables: fix NULL pointer dereference The check is wrong and lets NULL-ptrs slip through since !IS_ERR(NULL) is true. Coverity #190 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit baa829d8926f02ab04be6ec37780810d221c5b4b tree 8c2236eba68bb65aa535ab78e58777ff51de6746 parent 4a1ff6e2bde56cdf176bd54d557b2e15e819f810 author Patrick McHardy Sun, 12 Mar 2006 20:35:12 -0800 committer David S. Miller Sun, 12 Mar 2006 20:39:40 -0800 [IPV4/6]: Fix UFO error propagation When ufo_append_data fails err is uninitialized, but returned back. Strangely gcc doesn't notice it. Coverity #901 and #902 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 4a1ff6e2bde56cdf176bd54d557b2e15e819f810 tree c831cb72a76e69b3e781f070c510a59b06e39cb9 parent cc9a06cd8d6fbb69b4d3c46760c132cfe312fb85 author Patrick McHardy Sun, 12 Mar 2006 20:34:53 -0800 committer David S. Miller Sun, 12 Mar 2006 20:39:39 -0800 [TCP]: tcp_highspeed: fix AIMD table out-of-bounds access Covertiy #547 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit cc9a06cd8d6fbb69b4d3c46760c132cfe312fb85 tree c6dce78c5e845d9cd4d5baab7c8b29306fa77541 parent f8dc01f543f28253abeef649987249210d8db3cc author Patrick McHardy Sun, 12 Mar 2006 20:34:27 -0800 committer David S. Miller Sun, 12 Mar 2006 20:39:38 -0800 [NETLINK]: Fix use-after-free in netlink_recvmsg The skb given to netlink_cmsg_recv_pktinfo is already freed, move it up a few lines. Coverity #948 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f8dc01f543f28253abeef649987249210d8db3cc tree fc7d4a013cb2e2cc2e12354c29c23e695de69862 parent f6e57464df7ba0e91a23b0854adb56852dcd58a7 author Patrick McHardy Sun, 12 Mar 2006 20:33:49 -0800 committer David S. Miller Sun, 12 Mar 2006 20:39:37 -0800 [XFRM]: Fix leak in ah6_input tmp_hdr is not freed when ipv6_clear_mutable_options fails. Coverity #650 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit f6e57464df7ba0e91a23b0854adb56852dcd58a7 tree 9dfee36ee4e5150a3af876b44bca7516554aa5ec parent 406dbfc9ae0e6b7eb4da4a52c0a6556a0d7e6a2f author Patrick McHardy Sun, 12 Mar 2006 20:33:22 -0800 committer David S. Miller Sun, 12 Mar 2006 20:39:36 -0800 [NET_SCHED]: act_api: fix skb leak in error path The skb is allocated by the function, so it needs to be freed instead of trimmed on overrun. Coverity #614 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 406dbfc9ae0e6b7eb4da4a52c0a6556a0d7e6a2f tree 208366b1977eca0f2abad59e1c608fbf50fcbb21 parent 57ddd5c1803859d977c5a31a267d2c805ffe6e11 author Patrick McHardy Sun, 12 Mar 2006 20:32:47 -0800 committer David S. Miller Sun, 12 Mar 2006 20:39:35 -0800 [NETFILTER]: nfnetlink_queue: fix possible NULL-ptr dereference Fix NULL-ptr dereference when a config message for a non-existant queue containing only an NFQA_CFG_PARAMS attribute is received. Coverity #433 Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 57ddd5c1803859d977c5a31a267d2c805ffe6e11 tree bbc3e2a406f5ab2ddeb0ba0273867bee95b41612 parent 7cafae52381395d24b83996eca7a7b53ab6a8827 parent ed071adc97a69785686a37fb88e100f41b482b94 author Linus Torvalds Sun, 12 Mar 2006 16:41:27 -0800 committer Linus Torvalds Sun, 12 Mar 2006 16:41:27 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] ahci: fix NULL pointer dereference detected by Coverity commit 7cafae52381395d24b83996eca7a7b53ab6a8827 tree 05b3cfb71c7131aaabe3b78b6f0278e91cba5147 parent ba244fe9005323452428fee4b4b7d0c70a06b627 parent cdaabbd74b15296acf09215355a7f3b07b92b83e author Linus Torvalds Sun, 12 Mar 2006 14:56:02 -0800 committer Linus Torvalds Sun, 12 Mar 2006 14:56:02 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] iwmmxt thread state alignment [ARM] 3350/1: Enable 1-wire on ARM [ARM] 3356/1: Workaround for the ARM1136 I-cache invalidation problem [ARM] 3355/1: NSLU2: remove propmt depends [ARM] 3354/1: NAS100d: fix power led handling [ARM] Fix muldi3.S commit cdaabbd74b15296acf09215355a7f3b07b92b83e tree da2e2ce07a31eb10cb3649005479a9588ba22809 parent 04916c0ef482335cb0ae575dbc5a1d97619840cd author Russell King Sun, 12 Mar 2006 22:36:06 +0000 committer Russell King Sun, 12 Mar 2006 22:36:06 +0000 [ARM] iwmmxt thread state alignment This patch removes the reliance of iwmmxt on hand coded alignments. Since thread_info is always 8K aligned, specifying that fpstate is 8-byte aligned achieves the same effect without needing to resort to hand coded alignments. Signed-off-by: Russell King commit ba244fe9005323452428fee4b4b7d0c70a06b627 tree a2f64703eeb1cae57ea3d4b5d2dd481614ae82d1 parent c12743764129e40dc8461afc1096cf175c7c25f2 author David S. Miller Sat, 11 Mar 2006 18:51:49 -0800 committer David S. Miller Sat, 11 Mar 2006 18:51:49 -0800 [TCP]: Fix tcp_tso_should_defer() when limit>=65536 That's >= a full sized TSO frame, so we should always return 0 in that case. Based upon a report and initial patch from Lachlan Andrew, final patch suggested by Herbert Xu. Signed-off-by: David S. Miller commit c12743764129e40dc8461afc1096cf175c7c25f2 tree 080df077769b53cfae033849ab87cbd95f39c4b7 parent 0d27b42739ee432a66104793e51a23807b372928 author Gregor Maier Sat, 11 Mar 2006 18:51:25 -0800 committer David S. Miller Sat, 11 Mar 2006 18:51:25 -0800 [NETFILTER]: Fix wrong option spelling in Makefile for CONFIG_BRIDGE_EBT_ULOG Signed-off-by: Gregor Maier Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 0d27b42739ee432a66104793e51a23807b372928 tree d23986eff26122d06f6493029428a8748ff90040 parent 0ade309be739eceedc4812798da09d698a59867d author Brian Haley Sat, 11 Mar 2006 18:50:14 -0800 committer David S. Miller Sat, 11 Mar 2006 18:50:14 -0800 [IPV6]: fix ipv6_saddr_score struct element The scope element in the ipv6_saddr_score struct used in ipv6_dev_get_saddr() is an unsigned integer, but __ipv6_addr_src_scope() returns a signed integer (and can return -1). Signed-off-by: Brian Haley Acked-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 0ade309be739eceedc4812798da09d698a59867d tree 3d16e848a4f7202fbd8999117571706caccef8b7 parent 8f22757ee84da64d4f662f1dd03dae95358a1efe author Adrian Bunk Sat, 11 Mar 2006 18:49:38 -0800 committer David S. Miller Sat, 11 Mar 2006 18:49:38 -0800 [TG3] tg3_bus_string(): remove dead code The Coverity checker spotted this dead code (note that (clock_ctrl == 7) is already handled above). Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit 8f22757ee84da64d4f662f1dd03dae95358a1efe tree ebbf96d3c733c5cad9ab002740f1d4b829e07a4e parent 535744878e34d01a53f946f26dfbca37186f2cf8 author Dave Jones Sat, 11 Mar 2006 18:49:13 -0800 committer David S. Miller Sat, 11 Mar 2006 18:49:13 -0800 [TUN]: Fix leak in tun_get_user() We're leaking an skb in a failure path in this function. Coverity #632 Signed-off-by: Dave Jones Signed-off-by: David S. Miller commit ed071adc97a69785686a37fb88e100f41b482b94 tree 75be27a48365aab9cfe6531f7d1f5516e6602307 parent 6971ed1fbbc80cae54e082aae153d5b063885d0a parent 535744878e34d01a53f946f26dfbca37186f2cf8 author Jeff Garzik Sat, 11 Mar 2006 19:55:26 -0500 committer Jeff Garzik Sat, 11 Mar 2006 19:55:26 -0500 Merge branch 'master' commit 6971ed1fbbc80cae54e082aae153d5b063885d0a tree 164d950b587badb59dc2e2415ab74c2210accff7 parent ed62178589929d248a0aaf4018ca3867e2f96d9d author Tejun Heo Sat, 11 Mar 2006 12:47:54 +0900 committer Jeff Garzik Sat, 11 Mar 2006 19:06:02 -0500 [PATCH] ahci: fix NULL pointer dereference detected by Coverity Fix NULL pointer dereference detected by the Coverity checker. Kill dev -> pdev -> dev conversion while at it. Signed-off-by: Tejun Heo Cc: Adrian Bunk Signed-off-by: Jeff Garzik commit 04916c0ef482335cb0ae575dbc5a1d97619840cd tree e311fe75fd072232380eb1f4ed5e675442409d7a parent 141fa40cff90881ac4d81f6afa27bc283fe7acca author Alessandro Zummo Fri, 10 Mar 2006 22:30:01 +0000 committer Russell King Fri, 10 Mar 2006 22:30:01 +0000 [ARM] 3350/1: Enable 1-wire on ARM Patch from Alessandro Zummo This patches add the 1-wire drivers to the ARM Kconfig. Signed-off-by: Alessandro Zummo Signed-off-by: Russell King commit 141fa40cff90881ac4d81f6afa27bc283fe7acca tree 7991b0f3910dafb58e1ef92044153e5383b01850 parent e7fcdb79ecaa01e2eba06e3fb64e10455bdb5aa7 author Catalin Marinas Fri, 10 Mar 2006 22:26:47 +0000 committer Russell King Fri, 10 Mar 2006 22:26:47 +0000 [ARM] 3356/1: Workaround for the ARM1136 I-cache invalidation problem Patch from Catalin Marinas ARM1136 erratum 371025 (category 2) specifies that, under rare conditions, an invalidate I-cache by MVA (line or range) operation can fail to invalidate a cache line. The recommended workaround is to either invalidate the entire I-cache or invalidate the range by set/way rather than MVA. Note that for a 16K cache size, invalidating a 4K page by set/way is equivalent to invalidating the entire I-cache. Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit ad58f7dbeb6f5ea82679962f18985f16b660a2d9 tree 3951a1d5a27d2e10c55c7d6662cf8e726ffeed87 parent ad139a2f56e5789aa8a9f74e3600a7f854a38de9 author Andreas Herrmann Fri, 10 Mar 2006 00:56:16 +0100 committer James Bottomley Thu, 09 Mar 2006 19:11:03 -0500 [SCSI] zfcp: fix device registration issues The patch fixes following issues: (1) Replace scsi_add_device with scsi_scan_target. (Thus the rport instead of the scsi_host becomes parent of a scsi_target again.) (2) Avoid scsi_device allocation during registration of an remote port. (Would be done during fc_scsi_scan_rport.) (3) Fix queuecommand behaviour when an zfcp unit is blocked. (Call scsi_done with DID_NO_CONNECT instead of returning SCSI_MLQUEUE_DEVICE_BUSY otherwise we might end up waiting for completion in blk_execute_rq for ever.) Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit ad139a2f56e5789aa8a9f74e3600a7f854a38de9 tree c7913bb81cd698f29a63cb7a9728028635b75bbe parent cdaeedae9844ec3deaafa00b7dd8c21e01368633 author Andreas Herrmann Thu, 09 Mar 2006 16:37:49 +0100 committer James Bottomley Thu, 09 Mar 2006 11:00:59 -0500 [SCSI] scsi_transport_fc: fix FC_HOST_NUM_ATTRS In the past I added an host attribute but unfortunately I forgot to increase FC_HOST_NUM_ATTRS. This is fixed with the patch. Otherwise an fibre channel lld might run into BUG_ON(count > FC_HOST_NUM_ATTRS); in fc_attach_transport(). Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit e7fcdb79ecaa01e2eba06e3fb64e10455bdb5aa7 tree d0ce941930b18115c9a5ef91680fbfb6e298d5d6 parent dcc8fa50ebc251a1394a2c8561eee7d79cc5f437 author Alessandro Zummo Wed, 08 Mar 2006 23:45:12 +0000 committer Russell King Wed, 08 Mar 2006 23:45:12 +0000 [ARM] 3355/1: NSLU2: remove propmt depends Patch from Alessandro Zummo The patch that would have made the NSLU2 kernel non compatible with other ixp4xx machs never entered the kernel. So it is actually safe to remove the prompt dependencies. Signed-off-by: Alessandro Zummo Signed-off-by: Russell King commit dcc8fa50ebc251a1394a2c8561eee7d79cc5f437 tree 6830942f3721060f61227e7058fdfe1b4ab972d0 parent 3c8fdae78cf5d73c6739912a1ff087c0f23b2a47 author Alessandro Zummo Wed, 08 Mar 2006 23:45:10 +0000 committer Russell King Wed, 08 Mar 2006 23:45:10 +0000 [ARM] 3354/1: NAS100d: fix power led handling Patch from Alessandro Zummo Disable GPIO clocks to allow the power led to work properly. Signed-off-by: Alessandro Zummo Signed-off-by: Russell King commit 3c8fdae78cf5d73c6739912a1ff087c0f23b2a47 tree 85203dba56f72d897ffa073aa53fb03b011f4e52 parent 7986824e4e31d6c66f39d2f11ab93fcfed21f593 author Russell King Wed, 08 Mar 2006 17:25:33 +0000 committer Russell King Wed, 08 Mar 2006 17:25:33 +0000 [ARM] Fix muldi3.S When shifting the low-parts of signed numbers, a logical shift should be used to avoid sign-extending a bit which isn't a sign bit. Signed-off-by: Russell King commit cdaeedae9844ec3deaafa00b7dd8c21e01368633 tree 6ca651d5ddd4c081f48e57c7f737f1a93ac67750 parent 35dc2585fa32a2b300307ffa9f17122b13ccef97 author Dominik Brodowski Sun, 05 Mar 2006 11:42:06 +0100 committer James Bottomley Sun, 05 Mar 2006 08:00:47 -0600 [SCSI] scsi: aha152x pcmcia driver needs spi transport AHA152X PCMCIA module needs spi_print_msg. Signed-off-by: Dominik Brodowski Signed-off-by: James Bottomley commit 35dc2585fa32a2b300307ffa9f17122b13ccef97 tree 447534ca73584cba39bc033bbad2728e0195b44d parent 98acfc7e8e2606fadae6d2bf99fa040be917ce8c author Andreas Herrmann Thu, 02 Mar 2006 21:28:54 +0100 committer James Bottomley Thu, 02 Mar 2006 22:45:40 -0600 [SCSI] zfcp: correctly set this_id for hosts It fixes a bug in zfcp which provokes a race in scsi_scan.c. Finally this can lead to an Oops like: kernel BUG at fs/sysfs/symlink.c:87! Correctly set this_id for the host. Otherwise we provoke a race between scsi_target_reap_work and concurrent scsi_add_device. Signed-off-by: Andreas Herrmann Signed-off-by: James Bottomley commit 98acfc7e8e2606fadae6d2bf99fa040be917ce8c tree f6c2f8b84df16fdcfa3d2dd4958d40637c6a398a parent c499ec24c31edf270e777a868ffd0daddcfe7ebd author Matthew Wilcox Wed, 01 Mar 2006 12:04:46 -0700 committer James Bottomley Thu, 02 Mar 2006 22:44:06 -0600 [SCSI] Add Brownie to blacklist This device spews total rubbish to a REPORT LUNS command, so avoid sending it one. Signed-off-by: Matthew Wilcox Signed-off-by: James Bottomley