commit 38f5745c5a90641079fd5b48600ae63f7ab6edcd tree 42bd4d5fd3fb6a1b3016731d53be5732de55725d parent 1c7d67073e2d196597f541351bc9b109c8a93528 author Jack Steiner Thu, 31 Aug 2006 11:35:57 -0500 committer Tony Luck Fri, 08 Sep 2006 11:06:06 -0700 [IA64] SN fix for cpu hotplug/kexec The sn_cpu_init() is required for cpu initialization on SN platforms. Change __init to __cpuinit so that the function is not freed with init code/data. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 1c7d67073e2d196597f541351bc9b109c8a93528 tree 083f41edca573e59cb773672867cd24027102014 parent 2636255488484e04d6d54303d2b0ec30f7ef7e02 author Jack Steiner Thu, 31 Aug 2006 11:34:47 -0500 committer Tony Luck Fri, 08 Sep 2006 11:05:13 -0700 [IA64] Save register stack contents on cpu start The SN PROM uses the register stack in the slave loop. The contents must be preserved for the OS to return to the slave loop via offlining a cpu or for kexec. A 'flushrs" is needed to force the stack to be written to memory prior to changing bspstore. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 2636255488484e04d6d54303d2b0ec30f7ef7e02 tree 09b682cacdd5b6ef392aa4a85999d87cefe1014d parent b8444d00762703e1b6146fce12ce2684885f8bf6 author Andreas Schwab Mon, 04 Sep 2006 21:56:09 +0200 committer Tony Luck Fri, 08 Sep 2006 11:03:40 -0700 [IA64] Unwire set/get_robust_list The syscalls set/get_robust_list must not be wired up until futex_atomic_cmpxchg_inatomic is implemented. Otherwise the kernel will hang in handle_futex_death. Signed-off-by: Andreas Schwab Signed-off-by: Tony Luck commit b8444d00762703e1b6146fce12ce2684885f8bf6 tree ea29e11313f63d9cc6aea0c2fd0179e9e3184a2a parent e9f7bee1df223dcf83743b46cb06c08d95497ec0 author Stephane Eranian Fri, 25 Aug 2006 14:00:19 -0700 committer Tony Luck Fri, 08 Sep 2006 10:59:14 -0700 [IA64] correct file descriptor reference counting in perfmon Fix a bug in sys_perfmonctl() whereby it was not correctly decrementing the file descriptor reference count. Signed-off-by: stephane eranian Signed-off-by: Tony Luck commit e9f7bee1df223dcf83743b46cb06c08d95497ec0 tree 67beae4733ef0286645112a52623c81c8f8a19a9 parent 016eb4a0ed06a3677d67a584da901f0e9a63c666 author Trond Myklebust Fri, 08 Sep 2006 09:48:54 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:51 -0700 [PATCH] NFS: large non-page-aligned direct I/O clobbers memory The logic in nfs_direct_read_schedule and nfs_direct_write_schedule can allow data->npages to be one larger than rpages. This causes a page pointer to be written beyond the end of the pagevec in nfs_read_data (or nfs_write_data). Fix this by making nfs_(read|write)_alloc() calculate the size of the pagevec array, and initialise data->npages. Also get rid of the redundant argument to nfs_commit_alloc(). Signed-off-by: Trond Myklebust Cc: Chuck Lever Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 016eb4a0ed06a3677d67a584da901f0e9a63c666 tree 574ead6bd03d31ca7036ff2389cb0400f3fd63fc parent 3665d0e58fa44f50c744f85c7e8ad21d5b10e206 author Andrew Morton Fri, 08 Sep 2006 09:48:38 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -0700 [PATCH] invalidate_complete_page() race fix If a CPU faults this page into pagetables after invalidate_mapping_pages() checked page_mapped(), invalidate_complete_page() will still proceed to remove the page from pagecache. This leaves the page-faulting process with a detached page. If it was MAP_SHARED then file data loss will ensue. Fix that up by checking the page's refcount after taking tree_lock. Cc: Nick Piggin Cc: Hugh Dickins Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3665d0e58fa44f50c744f85c7e8ad21d5b10e206 tree 7714916ca20e906d685f6b0886195692d3471f68 parent 47d4b9066df023670a61e74565a75293cf15a441 author Badari Pulavarty Fri, 08 Sep 2006 09:48:21 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -0700 [PATCH] ext3_getblk() should handle HOLE correctly It has been reported that ext3_getblk() is not doing the right thing and triggering following WARN(): BUG: warning at fs/ext3/inode.c:1016/ext3_getblk() ext3_getblk+0x98/0x2a6 md_wakeup_thread+0x26/0x2a ext3_bread+0x1f/0x88 ext3_quota_read+0x136/0x1ae v1_read_dqblk+0x61/0xac dquot_acquire+0xf6/0x107 ext3_acquire_dquot+0x46/0x68 dqget+0x155/0x1e7 dquot_transfer+0x3e0/0x3e9 dput+0x23/0x13e ext3_setattr+0xc3/0x240 current_fs_time+0x52/0x6a notify_change+0x2bd/0x30d chown_common+0x9c/0xc5 strncpy_from_user+0x3b/0x68 do_path_lookup+0xdf/0x266 __user_walk_fd+0x44/0x5a sys_chown+0x4a/0x55 vfs_write+0xe7/0x13c sys_mkdir+0x1f/0x23 syscall_call+0x7/0xb Looking at the code, it looks like it's not handle HOLE correctly. It ends up returning -EIO. Here is the patch to fix it. If we really want to be paranoid, we can allow return values 0 (HOLE), 1 (we asked for one block) and return -EIO for more than 1 block. But I really don't see a reason for doing it - all we need is the block# here. (doesn't matter how many blocks are mapped). ext3_get_blocks_handle() returns number of blocks it mapped. It returns 0 in case of HOLE. ext3_getblk() should handle HOLE properly (currently its dumping warning stack and returning -EIO). Signed-off-by: Badari Pulavarty Acked-by: Mingming Cao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47d4b9066df023670a61e74565a75293cf15a441 tree 5306edd9f6669c85cfcfa30cba463265909f66c6 parent 67bb2c692cc02e53c23e4debc92c3a79ddc52a8c author David Wang Fri, 08 Sep 2006 09:47:51 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -0700 [PATCH] sis5513: add SiS south bridge ID 0x966 and 0x968 New SiS south bridge device ID is 0x966. Next coming product will be 0x968. (Will be released in Q4, this year) We don't make any updates to the IDE controller. Signed-off-by: David Wang Cc: Jeff Garzik Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67bb2c692cc02e53c23e4debc92c3a79ddc52a8c tree fbaca3deba2aba7ec8fa774d48b6cd19767b62ef parent 4495c9e5cabc82bb4ce930eb5d3dc7544f3f8389 author Alexey Dobriyan Fri, 08 Sep 2006 09:47:34 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -0700 [PATCH] sh: fix FPN_START typo Not that it passes allmodconfig without it... Signed-off-by: Alexey Dobriyan Cc: Paul Mundt Cc: Kazumoto Kojima Cc: Mark Haverkamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4495c9e5cabc82bb4ce930eb5d3dc7544f3f8389 tree 3e70a8e3d31a6665265e54f98d5f3d9554bdc547 parent c5780e976e19faff345fcef4a01db87108b51a44 author Alexey Dobriyan Fri, 08 Sep 2006 09:47:24 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -0700 [PATCH] optical /proc/ide/*/media Sergey Vlasov reported that his "FUJITSU MCC3064AP, ATAPI OPTICAL drive" pops up as UNKNOWN in /proc/ide/*/media . Closes #4145. Signed-off-by: Alexey Dobriyan Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5780e976e19faff345fcef4a01db87108b51a44 tree 1e75fc4cd3765beb575fb3196a477d97ed1905a4 parent 3a459756810912d2c2bf188cef566af255936b4d author Thomas Gleixner Fri, 08 Sep 2006 09:47:15 -0700 committer Linus Torvalds Fri, 08 Sep 2006 10:22:50 -0700 [PATCH] Use the correct restart option for futex_lock_pi The current implementation of futex_lock_pi returns -ERESTART_RESTARTBLOCK in case that the lock operation has been interrupted by a signal. This results in a return of -EINTR to userspace in case there is an handler for the signal. This is wrong, because userspace expects that the lock function does not return in any case of signal delivery. This was not caught by my insufficient test case, but triggered a nasty userspace problem in an high load application scenario. Unfortunately also glibc does not check for this invalid return value. Using -ERSTARTNOINTR makes sure, that the interrupted syscall is restarted. The restart block related code can be safely removed, as the possible timeout argument is an absolute time value. Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a459756810912d2c2bf188cef566af255936b4d tree 1b52d90a2412811ebf5078b4f55112864e1890df parent 10387e5eb45c6e48d67102b88229f5bc6037461c author Kirill Korotaev Thu, 07 Sep 2006 14:17:04 +0400 committer Linus Torvalds Fri, 08 Sep 2006 08:40:46 -0700 [PATCH] IA64,sparc: local DoS with corrupted ELFs This prevents cross-region mappings on IA64 and SPARC which could lead to system crash. They were correctly trapped for normal mmap() calls, but not for the kernel internal calls generated by executable loading. This code just moves the architecture-specific cross-region checks into an arch-specific "arch_mmap_check()" macro, and defines that for the architectures that needed it (ia64, sparc and sparc64). Architectures that don't have any special requirements can just ignore the new cross-region check, since the mmap() code will just notice on its own when the macro isn't defined. Signed-off-by: Pavel Emelianov Signed-off-by: Kirill Korotaev Acked-by: David Miller Signed-off-by: Greg Kroah-Hartman [ Cleaned up to not affect architectures that don't need it ] Signed-off-by: Linus Torvalds commit 10387e5eb45c6e48d67102b88229f5bc6037461c tree 77b305e7db8aa0b8b451c96f33aed66bf1a8a50f parent ebd6c17109aed086908ae3b0949265fd07712659 parent d279490543ee4e7c51371eb605b578ab47f45305 author Linus Torvalds Wed, 06 Sep 2006 11:00:59 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:59 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: [PATCH] myri10ge: update the firmware download URL in Kconfig commit ebd6c17109aed086908ae3b0949265fd07712659 tree 7a1af4b2ac8b6ce062206d0e967272d2ae457ff6 parent b4a228346c1a7d09f565e750d2e988c5671e9fa3 author john stultz Wed, 06 Sep 2006 11:02:45 +0100 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] FRV: Use the generic time stuff for FRV Use the generic time stuff for FRV. Signed-off-by: John Stultz Signed-Off-By: David Howells Signed-off-by: Linus Torvalds commit b4a228346c1a7d09f565e750d2e988c5671e9fa3 tree 8e6340f140da2f0b59457f40ed4ee6dc6dee6f6b parent bb98ad77d8451a3ccf9478738ffe7ec63394fcdf author David Woodhouse Wed, 06 Sep 2006 09:03:26 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] Remove unneeded asm-i386/cpufeature.h from user visibility. Signed-off-by: David Woodhouse Signed-off-by: Linus Torvalds commit bb98ad77d8451a3ccf9478738ffe7ec63394fcdf tree f642ce106f26e5ff13d6994555425a084f906b56 parent 068c4579fe5c21e84c7cb2ba89db80899e25104e author Ismail Donmez Wed, 06 Sep 2006 00:03:44 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] Move linux/device.h include in linux/atmdev.h to #ifdef __KERNEL__ section linux/device.h header is not included in the David Woodhouse's kernel-headers git tree which is used for userspace kernel headers. Which results in compile errors when building iproute2. Attached patch moves linux/device.h include under the #ifdef __KERNEL__ section. Signed-off-by: Ismail Donmez Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 068c4579fe5c21e84c7cb2ba89db80899e25104e tree ab16bf723c648d936cefb89b6dc6634145668b86 parent 471b40d0dfc17bf0161629950b82524d41bc37ce author Ingo Molnar Wed, 06 Sep 2006 00:03:44 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] lockdep: do not touch console state when tainting the kernel Remove an unintended console_verbose() side-effect from add_taint(). Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 471b40d0dfc17bf0161629950b82524d41bc37ce tree 1f3a95ec7a182e313556afe16d8107444d090fa8 parent 96dd7421a06a5bc6eb731323b95efcb2fd864854 author Pavel Machek Wed, 06 Sep 2006 00:03:43 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] prevent swsusp with PAE PAE + swsusp results in hard-to-debug crash about 50% of time during resume. Cause is known, fix needs to be ported from x86-64 (but we can't make it to 2.6.18, and I'd like this to be worked around in 2.6.18). Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96dd7421a06a5bc6eb731323b95efcb2fd864854 tree a450951e439f897ee92ba6b068efb77c0edc6a1a parent fe2bbc4832659b7ffc867cac03e0a92ae81e11e4 author Thomas Gleixner Wed, 06 Sep 2006 00:03:42 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:02 -0700 [PATCH] prevent timespec/timeval to ktime_t overflow Frank v. Waveren pointed out that on 64bit machines the timespec to ktime_t conversion might overflow. This is also true for timeval to ktime_t conversions. This breaks a "sleep inf" on 64bit machines. While a timespec/timeval with tx.sec = MAX_LONG is valid by specification the internal representation of ktime_t is based on nanoseconds. The conversion of seconds to nanoseconds overflows for seconds values >= (MAX_LONG / NSEC_PER_SEC). Check the seconds argument to the conversion and limit it to the maximum time which can be represented by ktime_t. Signed-off-by: Thomas Gleixner Cc: Ingo Molnar Cc: Frank v Waveren Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe2bbc4832659b7ffc867cac03e0a92ae81e11e4 tree 9c0ece0fd67295acb4230d1f9da729db26a00a48 parent 6dba28379edc08327ede01ff41bd3c9dd46a7fa0 author Henrik Kretzschmar Wed, 06 Sep 2006 00:03:41 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:01 -0700 [PATCH] add missing desctiption in super.c Adds kernel-doc for alloc_super() type in fs/super.c. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6dba28379edc08327ede01ff41bd3c9dd46a7fa0 tree 945418feebb2dcf4387ce86bf57a6c4f757e7b43 parent fc47e7b592dc45b03c27b0a4c8f2d215dae9944d author Henrik Kretzschmar Wed, 06 Sep 2006 00:03:40 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:01 -0700 [PATCH] Documentation for lock_key in struct hrtimer_base Fixes an error message on make xmldocs. Signed-off-by: Henrik Kretzschmar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc47e7b592dc45b03c27b0a4c8f2d215dae9944d tree 54ea55d491e2f708bc23655041668e19da3de619 parent c336923b668fdcf0312efbec3b44895d713f4d81 author Jarek Poplawski Wed, 06 Sep 2006 00:03:39 -0700 committer Linus Torvalds Wed, 06 Sep 2006 11:00:01 -0700 [PATCH] lockdep ifdef fix With CONFIG_SMP=y CONFIG_PREEMPT=y CONFIG_LOCKDEP=y CONFIG_DEBUG_LOCK_ALLOC=y # CONFIG_PROVE_LOCKING is not set spin_unlock_irqrestore() goes through lockdep but spin_lock_irqsave() doesn't. Apparently, bad things happen. Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d279490543ee4e7c51371eb605b578ab47f45305 tree 45217be4f3e2b6938d7b330cda6eb0a9a2cedf12 parent c336923b668fdcf0312efbec3b44895d713f4d81 author Brice Goglin Tue, 05 Sep 2006 21:58:50 -0400 committer Jeff Garzik Wed, 06 Sep 2006 11:04:26 -0400 [PATCH] myri10ge: update the firmware download URL in Kconfig Update the firmware download URL in Kconfig to match the header in drivers/net/myri10ge/myri10ge.c. Signed-off-by: Brice Goglin Signed-off-by: Jeff Garzik