commit 63b98080daa35f0d682db04f4fb7ada010888752 tree 213e124c89a51bbb99dd8e07fb6eacc970bbdc99 parent 1883c5aba9973331e3ff0050e05707fe8e84fe0d parent eeac5c142b8687e35780b11b54b4c2f95b1a2436 author Linus Torvalds Wed, 13 Sep 2006 08:01:41 -0700 committer Linus Torvalds Wed, 13 Sep 2006 08:01:41 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix G5 DART (IOMMU) race causing occasional data corruption [POWERPC] Fix MMIO ops to provide expected barrier behaviour [POWERPC] Fix interrupt clearing in kdump shutdown sequence [POWERPC] update prep_defconfig [POWERPC] kdump: Support kernels having 64k page size. [POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic(). [POWERPC] Add new, missing argument to of_irq_map_raw() for 86xx. [POWERPC] Update defconfigs commit 1883c5aba9973331e3ff0050e05707fe8e84fe0d tree 3ef47d3499c9bc74898cb883f4c6668532146ea4 parent a2aa3e2304e21e2b8bf52b69ac9f1e0cb0320909 author Mike Miller Tue, 12 Sep 2006 20:36:07 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:16 -0700 [PATCH] cciss: version update, new hw Add support for new hardware and bumps the version to 3.6.10. It seems there were several changes introduced including soft_irq. I decided to bump the major number to reflect these changes. Since we're still supporting older vendor kernels I need some way differentiate between kernel versions <=2.6.10 and newer kernels >=2.6.16. Signed-off-by: Mike Miller Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2aa3e2304e21e2b8bf52b69ac9f1e0cb0320909 tree 67bf4deebf807ee939ad5f91491c2e1b312e6e62 parent f01f0f052d1255dcdcf11d4872c4bca95e46b36c author David Woodhouse Tue, 12 Sep 2006 20:36:06 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:16 -0700 [PATCH] headers_check: fix userspace build of asm-mips/page.h MIPS asm/page.h unconditionally includes , which doesn't exist in userspace. Move an #endif /* __KERNEL__ */ down a few lines to prevent that. Also, remove the broken definition of PAGE_SIZE which is never going to be correct -- in the absence of PAGE_SIZE, non-broken userspace will fall back to using sysconf() or getpagesize() instead. Signed-off-by: David Woodhouse Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f01f0f052d1255dcdcf11d4872c4bca95e46b36c tree 813950ac98390893ede57af6693ffe42bc5609a5 parent 651c923a4446dc5aee385d81c2436d6edf8c9a0c author David Woodhouse Tue, 12 Sep 2006 20:36:05 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:16 -0700 [PATCH] headers_check: don't expose PFN stuff to userspace in The header file doesn't exist in userspace and probably shouldn't -- but it's used unconditionally in . Protect it with #ifdef __KERNEL__ and move setup.h from $(header-y) to $(unifdef-y) in Kbuild accordingly. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 651c923a4446dc5aee385d81c2436d6edf8c9a0c tree b1323fa960c2af80d87af40d8597d72d4e61e4f0 parent b40c274a03f70d1f758753c56452bed506e47a09 author David Woodhouse Tue, 12 Sep 2006 20:36:04 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: move kernel-only #includes within Some files which don't exist in userspace were being included unconditionally in asm-i386/elf.h. Move the offending #includes down a few lines so that they're protected by #ifdef __KERNEL__ In fact, we probably want to kill off all userspace use of asm/elf.h -- but we aren't there yet, so we should at least make it possible to include it for now. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b40c274a03f70d1f758753c56452bed506e47a09 tree 0a2084d2bc69580703ddde93e77d160c69d92ba1 parent ee6baf884b27739cca110e5167a2edfa061ca19f author David Woodhouse Tue, 12 Sep 2006 20:36:04 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: move inclusion of in Because doesn't exist in userspace, it should be only included from within #ifdef __KERNEL__. Move the corresponding #include Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee6baf884b27739cca110e5167a2edfa061ca19f tree 27db3ed3a2d2c441fe0cda5811954421b5e0512c parent 7f1cbe51ffc1273bcded36742ede4b6ebef1b640 author David Woodhouse Tue, 12 Sep 2006 20:36:03 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: remove from user export There's useful stuff in but has nothing for userspace. Stop exporting it, and include it only from within the existing #ifdef __KERNEL__ part of This fixes a 'make headers_check' failure on i386 because asm-i386/timex.h includes both asm-i386/tsc.h and asm-i386/processor.h, neither of which are exported to userspace. It's not entirely clear _why_ it includes either of these, but it does. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f1cbe51ffc1273bcded36742ede4b6ebef1b640 tree c9b02340f7f0884164026ce1e494d585490b0ad7 parent d5e064a6c733d3902302dbaca33dd3c76af77f38 author David Woodhouse Tue, 12 Sep 2006 20:36:02 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: reduce user-visible noise in We don't need any of this crap included from the user-visible part of nfs_fs.h -- remove it all. In fact, we probably don't need anything but NFS_SUPER_MAGIC to be defined; is there any need for anything else? And magic numbers should probably move to rather than being strewn across various fs-specific include files which exist in userspace for solely that purpose. With this patch, 'make header_check' works again at least on PowerPC. Signed-off-by: David Woodhouse Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d5e064a6c733d3902302dbaca33dd3c76af77f38 tree 29f589a7aa8847a57d09278e80712d65e3177430 parent 120e2a97268c312bf81ee3d8cacc75d1f75ef8b5 author Alexey Dobriyan Tue, 12 Sep 2006 20:36:01 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: clarify error message Signed-off-by: Alexey Dobriyan Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 120e2a97268c312bf81ee3d8cacc75d1f75ef8b5 tree 1c7f2aa0bc0ebb3f34edfe33eae02be0f2da507a parent 354332ee44834819ff31a0afbeffda0c32244f8f author Alexey Dobriyan Tue, 12 Sep 2006 20:36:00 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:15 -0700 [PATCH] headers_check: improve #include regexp The following combinations of pp-tokens are used #include #include # include so, script'd better check for all of them. Signed-off-by: Alexey Dobriyan Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 354332ee44834819ff31a0afbeffda0c32244f8f tree d2ebd322ed731164dae55157528ad6b6672d6160 parent dd9daa221e77f642954849a795fa7c59533a9b2f author Jeremy Fitzhardinge Tue, 12 Sep 2006 20:35:57 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] x86: reserve a boot-loader ID number for Xen Claim an ID number for Xen in the LOADER_TYPE field. Also, keep the table in zero-page.txt consistent with boot.txt. [hpa says: 6 was skipped because I couldn't rule out that it hadn't been unofficially used. It seemed easier to skip it for now.] Signed-off-by: Jeremy Fitzhardinge Acked-by: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd9daa221e77f642954849a795fa7c59533a9b2f tree 6b207a5296063e1a773f36fb724402ea7cbab7eb parent 7fbb36451a91de6e8f9ece4f1f1ee9bd8ebf838a author Oleg Nesterov Tue, 12 Sep 2006 20:35:55 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] rcu_do_batch: make ->qlen decrement irq safe rcu_do_batch() decrements rdp->qlen with irqs enabled. This is not good, it can also be modified by call_rcu() from interrupt. Decrement ->qlen once with irqs disabled, after a main loop. Signed-off-by: Oleg Nesterov Cc: Dipankar Sarma Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fbb36451a91de6e8f9ece4f1f1ee9bd8ebf838a tree 407afc82b2560a785592a6cb052f3124504fcf12 parent e11db063d86d0ef9d7903cb463bb542b5d4e9ddd author Stefan Richter Tue, 12 Sep 2006 20:35:54 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] SCSI: lockdep annotation in scsi_send_eh_cmnd Fixup for lockdep enabled kernels: Annotate an on-stack completion. Signed-off-by: Stefan Richter Acked-by: Ingo Molnar Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e11db063d86d0ef9d7903cb463bb542b5d4e9ddd tree 646a193a8e8b8a20a8a9836a2ed7760f21a776f1 parent af45f32d25cc1e374184675eadc9f740221d8392 author Michael De Backer Tue, 12 Sep 2006 20:35:53 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] alim15x3.c: M5229 (rev c8) support for DMA cd-writer Configuration bits are not set properly for DMA on some chipset revisions. It has already been corrected for M5229 (rev c7) but not for M5229 (rev c8). This leads to the bug described at http://bugzilla.kernel.org/show_bug.cgi?id=5786 (lost interrupt + ide bus hangs). Signed-off-by: Michael De Backer Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af45f32d25cc1e374184675eadc9f740221d8392 tree 54e804d974dbd1d262fe78d14c8d384cfaea9df4 parent 9bb25bf36f0d7b06368432e2324dbbc2e98b5e60 author Greg KH Tue, 12 Sep 2006 20:35:52 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] We can not allow anonymous contributions to the kernel The DCO does not mean anything if we allow anonymous contributors to the kernel. As this is an open source project, we need to do everything in the open. Signed-off-by: Greg Kroah-Hartman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9bb25bf36f0d7b06368432e2324dbbc2e98b5e60 tree c788a094599f6d1d82bd1263290757d7a6a1d7c7 parent a4f5749ba6e3f23ae4a137cee10324830db4d081 author Ingo Molnar Tue, 12 Sep 2006 20:35:50 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] lockdep: double the number of stack-trace entries Miles Lane reported the "BUG: MAX_STACK_TRACE_ENTRIES too low!" message, which means that during normal use his system produced enough lockdep events so that the 128-thousand entries stack-trace array got exhausted. Double the size of the array. Signed-off-by: Ingo Molnar Cc: Miles Lane Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4f5749ba6e3f23ae4a137cee10324830db4d081 tree 5f3908d5bf29f97b65c01a140bb62a9ef9e3003a parent 95064a75ebf8744e1ff595e8cd7ff9b6c851523e author Tejun Heo Tue, 12 Sep 2006 20:35:49 -0700 committer Linus Torvalds Wed, 13 Sep 2006 07:32:14 -0700 [PATCH] libata: ignore CFA signature while sanity-checking an ATAPI device 0x848a in ID word 0 indicates CFA device iff the ID data is obtained from IDENTIFY DEVICE. For ATAPI devices, 0x848a in ID work 0 indicates valid ATAPI device. Fix sanity check in ata_dev_read_id() such that ATAPI devices reporting 0x848a in ID word 0 is not handled as error. The problem is identified by J.A. Magallon with HL-DT-ST DVDRAM GSA-4120B. Signed-off-by: Tejun Helo Cc: J.A. Magallon Acked-by: Jeff Garzik Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eeac5c142b8687e35780b11b54b4c2f95b1a2436 tree c0df8f3f5b154d41a63bff1a4e49f2bf5172b079 parent f007cacffc8870702a1473d83ba5e4922d54e17c author Benjamin Herrenschmidt Wed, 13 Sep 2006 22:12:52 +1000 committer Paul Mackerras Wed, 13 Sep 2006 22:12:52 +1000 [POWERPC] Fix G5 DART (IOMMU) race causing occasional data corruption It seems that the occasional data corruption observed with the tg3 driver wasn't due to missing barriers after all, but rather seems to be due to the DART (= IOMMU) in the U4 northbridge reading stale IOMMU table entries from memory due to a race. This fixes it by making the CPU read the entry back from memory before using it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit f007cacffc8870702a1473d83ba5e4922d54e17c tree 7faa1dbd7ccd2c4536f29852e0fedf7499d90508 parent 2e8e8dacc566cc91cd8707cb092e76c7bbfab178 author Paul Mackerras Wed, 13 Sep 2006 22:08:26 +1000 committer Paul Mackerras Wed, 13 Sep 2006 22:08:26 +1000 [POWERPC] Fix MMIO ops to provide expected barrier behaviour This changes the writeX family of functions to have a sync instruction before the MMIO store rather than after, because the generally expected behaviour is that the device receiving the MMIO store can be guaranteed to see the effects of any preceding writes to normal memory. To preserve ordering between writeX and readX, and to preserve ordering between preceding stores and the readX, the readX family of functions have had an sync added before the load. Although writeX followed by spin_unlock is not officially guaranteed to keep the writeX inside the spin-locked region unless an mmiowb() is used, there are currently drivers that depend on the previous behaviour on powerpc, which was that the mmiowb wasn't actually required. Therefore we have a per-cpu flag that is set by writeX, cleared by __raw_spin_lock and mmiowb, and tested by __raw_spin_unlock. If it is set, __raw_spin_unlock does a sync and clears it. This changes both 32-bit and 64-bit readX/writeX. 32-bit already has a sync in __raw_spin_unlock (since lwsync doesn't exist on 32-bit), and thus doesn't need the per-cpu flag. Tested on G5 (PPC970) and POWER5. Signed-off-by: Paul Mackerras commit 2e8e8dacc566cc91cd8707cb092e76c7bbfab178 tree ccb14c4d73874782bef530877f3e0066284bce3f parent ebf2ed283897b752daa743952aff43d78b725183 author Mohan Kumar M Tue, 12 Sep 2006 17:48:21 +0530 committer Paul Mackerras Wed, 13 Sep 2006 18:31:23 +1000 [POWERPC] Fix interrupt clearing in kdump shutdown sequence Call chip->eoi(irq) to clear any pending interrupt in case of kdump shutdown sequence. chip->end(irq) does not serve this purpose. Signed-off-by: Mohan Kumar M Signed-off-by: Paul Mackerras commit ebf2ed283897b752daa743952aff43d78b725183 tree b8355873a18afd892b6d2fd5746628a25ca27aef parent e269d269e0b53a7a6cb1d04290f8174bf0488cb4 author Olaf Hering Thu, 07 Sep 2006 14:44:45 +0200 committer Paul Mackerras Wed, 13 Sep 2006 18:30:08 +1000 [POWERPC] update prep_defconfig Update PReP defconfig, disable some drivers for hardware that is not used on those systems; enable SL82C105 IDE driver for Powerstack. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit e269d269e0b53a7a6cb1d04290f8174bf0488cb4 tree 387a80fdf9a3ca1ff052911bc3990126e3f0d9ca parent 69588298188b40ed7f75c98a6fd328d82f23ca21 author Sachin P. Sant Fri, 08 Sep 2006 07:59:52 +0530 committer Paul Mackerras Wed, 13 Sep 2006 18:30:04 +1000 [POWERPC] kdump: Support kernels having 64k page size. This is required to generate proper core files using kdump on ppc64. Create a backup region of 64K size irrespective of the PAGE SIZE. At present 32K was used as backup size. In the case of 64K page size, second PT_LOAD segments starts at 32K and the first one is not page aligned. __ioremap() (crash_dump.c) fails if pfn = 0 which is the case for the second PT_LOAD segment. This is not an issue for 4K page size because the the first page (32K backup) is copied to second kernel memory and thus referencing with the second kernel pfn. Signed-off-by: Sachin Sant Signed-off-by: Paul Mackerras commit 69588298188b40ed7f75c98a6fd328d82f23ca21 tree 4b8f8846cc3f4a0f4ae9eb04e4b2de2c12da75fe parent 20fb96e2aa009ae9892fde9ef7ffa82f56eebd11 author David Woodhouse Mon, 04 Sep 2006 21:53:14 -0700 committer Paul Mackerras Wed, 13 Sep 2006 18:28:41 +1000 [POWERPC] Implement PowerPC futex_atomic_cmpxchg_inatomic(). The sys_[gs]et_robust_list() syscalls were wired up on PowerPC but didn't work correctly because futex_atomic_cmpxchg_inatomic() wasn't implemented. Implement it, based on __cmpxchg_u32(). Signed-off-by: David Woodhouse Signed-off-by: Paul Mackerras commit 20fb96e2aa009ae9892fde9ef7ffa82f56eebd11 tree 7e1cbaeb9dc72d1e332fe9a68435eb00ddda4e82 parent fb7d527c1aec5e224fb3a0772337f8b5e59eecd0 author Jon Loeliger Fri, 01 Sep 2006 10:17:20 -0500 committer Paul Mackerras Wed, 13 Sep 2006 18:28:28 +1000 [POWERPC] Add new, missing argument to of_irq_map_raw() for 86xx. Ben speaks; we follow. Signed-off-by: Jon Loeliger Signed-off-by: Paul Mackerras commit fb7d527c1aec5e224fb3a0772337f8b5e59eecd0 tree 5bbb2da58ef0d4bdb29abe3a37047dcd29d19969 parent 10387e5eb45c6e48d67102b88229f5bc6037461c author Paul Mackerras Sun, 10 Sep 2006 11:04:36 +1000 committer Paul Mackerras Sun, 10 Sep 2006 11:04:36 +1000 [POWERPC] Update defconfigs Signed-off-by: Paul Mackerras