commit 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 tree 4ccf519a20c9b5bb3701c8b4d38b01af8bef854e parent ce38cac48209d270d07fd6d1a8e94446b37abcd5 parent 8d950cb8896fc95a9444d190885779438bb9d01c author Linus Torvalds Mon, 31 Jul 2006 13:39:52 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:39:52 -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] Minor comment fix for misc_64.S [POWERPC] Use H_CEDE on non-SMT [POWERPC] force 64bit mode in fwnmi handlers to workaround firmware bugs [POWERPC] PMAC_APM_EMU should depend on ADB_PMU [POWERPC] Fix new interrupt code (MPIC detection) [POWERPC] Fix new interrupt code (MPIC endianness) [POWERPC] Add cpufreq support for Xserve G5 [POWERPC] Xserve G5 thermal control fixes [POWERPC] Fix mem= handling when the memory limit is > RMO size [POWERPC] More offb/bootx fixes [POWERPC] Fix legacy_serial.c error handling on 32 bits [POWERPC] Fix default clock for udbg_16550 [POWERPC] Fix non-MPIC CHRPs with CONFIG_SMP set [POWERPC] Fix 32 bits warning in prom_init.c [POWERPC] Workaround Pegasos incorrect ISA "ranges" [POWERPC] fix up front-LED Kconfig commit ce38cac48209d270d07fd6d1a8e94446b37abcd5 tree c7840212a8dbc2002734e20ed2e3b0e8f63c857c parent b1367d2a2817e6199092b43fe01c1eed3374c4e4 author Guido Guenther Sun, 30 Jul 2006 03:04:21 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:45 -0700 [PATCH] rivafb/nvidiafb: race between register_framebuffer and *_bl_init Since we now use the generic backlight infrastructure, I think we need to call rivafb_bl_init before calling register_framebuffer since otherwise rivafb_bl_init might race with the framebuffer layer already opening the device and setting up the video mode. In this case we might end up with a not yet fully intialized backlight (info->bl_dev still NULL) when calling riva_bl_set_power via rivafb_set_par/rivafb_load_video_mode and the kernel dies without any further notice during boot. This fixes booting current git on a PB 6,1. In this case radeonfb/atyfb would be affected too - I can fix that too but don't have any hardware to test this on. Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1367d2a2817e6199092b43fe01c1eed3374c4e4 tree d769c5d098ac1ff34e8b4cfd579e6854ca930dae parent 4b755999d6e0c1d988fb448289abb6c226cd8c36 author Arthur Othieno Sun, 30 Jul 2006 03:04:20 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:45 -0700 [PATCH] nvidiafb: remove redundant CONFIG_PCI check CONFIG_FB_NVIDIA already depends on CONFIG_PCI in drivers/video/Kconfig. Driver does an extra ``sanity check'' which is then redundant. Signed-off-by: Arthur Othieno Cc: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b755999d6e0c1d988fb448289abb6c226cd8c36 tree 0310376a65b0d25af249554a133b5a799acf22f6 parent 994aad251acab32a5d40d4a9501dc3e736562b6d author Michael Hanselmann Sun, 30 Jul 2006 03:04:19 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:45 -0700 [PATCH] powermac: More powermac backlight fixes This patch fixes several problems: - The legacy backlight value might be set at interrupt time. Introduced a worker to prevent it from directly calling the backlight code. - via-pmu allows the backlight to be grabbed, in which case we need to prevent other kernel code from changing the brightness. - Don't send PMU requests in via-pmu-backlight when the machine is about to sleep or waking up. - More Kconfig fixes. Signed-off-by: Michael Hanselmann Cc: Benjamin Herrenschmidt Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 994aad251acab32a5d40d4a9501dc3e736562b6d tree 4c816fa097d07b2c4a4f46d26023af94f9a26822 parent 256154fbc31c25a8df4d398232acfa9d4892224c author Volker Braun Sun, 30 Jul 2006 03:04:18 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:45 -0700 [PATCH] radeonfb sleep fixes Many IBM Thinkpad T4* models and some R* and X* with radeon video cards draw too much power when suspended to RAM, reducing drastically the battery lifetime. The solution is to enable suspend-to-D2 on these machines. They are whitelisted through their subsystem vendor/device ID. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=3022 The patch introduces a framework to alter the pm_mode and reinit_func fields of the radeonfb_info structure based on a whitelist. This should facilitate future hardware-dependent workarounds. The workaround for the Samsung P35 that is already in the radeonfb code has been rewritten using this framework. The behavior can be overridden with module options: i) video=radeonfb:force_sleep=1 enable suspend-to-D2 also on non-whitelisted machines (useful for testing new notebook models), ii) video=radeonfb:ignore_devlist=1 Disable checking the whitelist and do not apply any workarounds. Cc: Benjamin Herrenschmidt Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 256154fbc31c25a8df4d398232acfa9d4892224c tree 278582add1a28766a1f3f4dba2f250cdbb191e0a parent 834a9b8ca7a01c34570be021f88e18884a29f048 author Antonino A. Daplas Sun, 30 Jul 2006 03:04:17 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:44 -0700 [PATCH] fbdev: statically link the framebuffer notification functions The backlight and lcd subsystems can be notified by the framebuffer layer of blanking events. However, these subsystems, as a whole, can function independently from the framebuffer layer. But in order to enable to the lcd and backlight subsystems, the framebuffer has to be compiled also, effectively sucking in a huge amount of unneeded code. To prevent dependency problems, separate out the framebuffer notification mechanism from the framebuffer layer and permanently link it to the kernel. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 834a9b8ca7a01c34570be021f88e18884a29f048 tree caf3a37ae5d73a235f17bc353e8e0a7b2c87934e parent 1f525f16e0a2b5743a64bf6991d3b6704271f8b6 author Eric Van Hensbergen Sun, 30 Jul 2006 03:04:16 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:44 -0700 [PATCH] 9p: fix fid behavior on failed remove Based on a bug report from Russ Ross According to the spec: "The remove request asks the file server both to remove the file represented by fid and to clunk the fid, even if the remove fails." but the Linux client seems to expect the fid to be valid after a failed remove attempt. Specifically, I'm getting this behavior when attempting to remove a non-empty directory. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f525f16e0a2b5743a64bf6991d3b6704271f8b6 tree 3ffc823f721c87dd9b4650a20f2cd16e43e7f832 parent 4c90c68aca278f425afc0b48d86298b960fbc0ce author Randy Dunlap Sun, 30 Jul 2006 03:04:16 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:44 -0700 [PATCH] update KJ details Use preferred email address. Remove sf.net project reference. It is no longer used. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c90c68aca278f425afc0b48d86298b960fbc0ce tree 4c2ba4152b1d58e7b899b01ffe7fe3624498b1c5 parent 0e31f51d8177320d61ec5786ca4aafa7b7a749b4 author Russ Ross Sun, 30 Jul 2006 03:04:15 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:44 -0700 [PATCH] 9p: fix marshalling bug in tcreate with empty extension field Signed-off-by: Russ Ross Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e31f51d8177320d61ec5786ca4aafa7b7a749b4 tree a076261c90d757d7d2740c1ba4d219782914ea4d parent 51d8c5edd3b166fcc51aba84d78761d578400a7c author Badari Pulavarty Sun, 30 Jul 2006 03:04:14 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:44 -0700 [PATCH] ext3 -nobh option causes oops For files other than IFREG, nobh option doesn't make sense. Modifications to them are journalled and needs buffer heads to do that. Without this patch, we get kernel oops in page_buffers(). Signed-off-by: Badari Pulavarty Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51d8c5edd3b166fcc51aba84d78761d578400a7c tree d3cf04b8fd2d7a5a2ba8c0957bd3dbe3839981f5 parent bc65ac6a0ffc66c56d1e6893685d7fe87c63cc44 author Josh Triplett Sun, 30 Jul 2006 03:04:14 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:44 -0700 [PATCH] timer: Fix tvec_bases initializer kernel/timer.c defines a (per-cpu) pointer to tvec_base_t, but initializes it using { &a_tvec_base_t }, which sparse warns about; change this to just &a_tvec_base_t. Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc65ac6a0ffc66c56d1e6893685d7fe87c63cc44 tree 8c8bde036220b27361e864249c4961fdc2591eca parent 0a5eca6530eb4d0120981936058537c24a2f92ce author Josh Triplett Sun, 30 Jul 2006 03:04:12 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:44 -0700 [PATCH] freevxfs: Add missing lock_kernel() to vxfs_readdir Commit 7b2fd697427e73c81d5fa659efd91bd07d303b0e in the historical GIT tree stopped calling the readdir member of a file_operations struct with the big kernel lock held, and fixed up all the readdir functions to do their own locking. However, that change added calls to unlock_kernel() in vxfs_readdir, but no call to lock_kernel(). Fix this by adding a call to lock_kernel(). Signed-off-by: Josh Triplett Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a5eca6530eb4d0120981936058537c24a2f92ce tree 0e9d49c3dbaa646f578d9fb0c83a179b5775b1a3 parent 5a06a363ef48444186f18095ae1b932dddbbfa89 author Thomas Horsley Sun, 30 Jul 2006 03:04:12 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:44 -0700 [PATCH] documentation: Documentation/initrd.txt I spent a long time the other day trying to examine an initrd image on a fedora core 5 system because the initrd.txt file is apparently obsolete. Here is a patch which I hope will reduce future confusion for others. Signed-off-by: Thomas Horsley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a06a363ef48444186f18095ae1b932dddbbfa89 tree d344aeb99d82be4d21d930afea0ea6b1da230edc parent 873302c71c0e60234eb187b15f83c2d79e84c40a author Ingo Molnar Sun, 30 Jul 2006 03:04:11 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:44 -0700 [PATCH] ipc/msg.c: clean up coding style Clean up ipc/msg.c to conform to Documentation/CodingStyle. (before it was an inconsistent hodepodge of various coding styles) Verified that the before/after .o's are identical. Signed-off-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 873302c71c0e60234eb187b15f83c2d79e84c40a tree 65288ff5a46b03c69ffc0b0634ab5bed37f1bc9a parent 0a0898cf413876d4ed6e371f3e04bf38600a9205 author Miklos Szeredi Sun, 30 Jul 2006 03:04:10 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:43 -0700 [PATCH] fuse: fix typo Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a0898cf413876d4ed6e371f3e04bf38600a9205 tree 700c9e87bdd78392bd3fa11f2f976d360b8a5cd2 parent 685d16ddb07b74537fb18972784e6214840fdd20 author Miklos Szeredi Sun, 30 Jul 2006 03:04:10 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:43 -0700 [PATCH] fuse: use jiffies_64 It is entirely possible (though rare) that jiffies half-wraps around, while a dentry/inode remains in the cache. This could mean that the dentry/inode is not invalidated for another half wraparound-time. To get around this problem, use 64-bit jiffies. The only problem with this is that dentry->d_time is 32 bits on 32-bit archs. So use d_fsdata as the high 32 bits. This is an ugly hack, but far simpler, than having to allocate private data just for this purpose. Since 64-bit jiffies can be assumed never to wrap around, simple comparison can be used, and a zero time value can represent "invalid". Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 685d16ddb07b74537fb18972784e6214840fdd20 tree f9a0825348629824f7867270c5860edb02e91e75 parent 25d7dfdaf3404bb31b8f55283fd2c456cb7b4001 author Miklos Szeredi Sun, 30 Jul 2006 03:04:08 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:43 -0700 [PATCH] fuse: fix zero timeout An attribute and entry timeout of zero should mean, that the entity is invalidated immediately after the operation. Previously invalidation only happened at the next clock tick. Reported and tested by Craig Davies. Signed-off-by: Miklos Szeredi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25d7dfdaf3404bb31b8f55283fd2c456cb7b4001 tree 05ef97c24267fe853ed80dc08cbfe5b029ef21f1 parent 0b0bf7a3ccb6f0b38ead71980e79f875046047b7 author Markus Armbruster Sun, 30 Jul 2006 03:04:08 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:43 -0700 [PATCH] Fix trivial unwind info bug CFA needs to be adjusted upwards for push, and downwards for pop. arch/i386/kernel/entry.S gets it wrong in one place. Signed-off-by: Markus Armbruster Acked-by: Jan Beulich Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b0bf7a3ccb6f0b38ead71980e79f875046047b7 tree 1c7b0689d2f0f9839ff9a793ed3990d9c1591fc0 parent 072d3d1acb452f4abd8d3d20af661f2e28854b59 author Roland McGrath Sun, 30 Jul 2006 03:04:06 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:43 -0700 [PATCH] vDSO hash-style fix The latest toolchains can produce a new ELF section in DSOs and dynamically-linked executables. The new section ".gnu.hash" replaces ".hash", and allows for more efficient runtime symbol lookups by the dynamic linker. The new ld option --hash-style={sysv|gnu|both} controls whether to produce the old ".hash", the new ".gnu.hash", or both. In some new systems such as Fedora Core 6, gcc by default passes --hash-style=gnu to the linker, so that a standard invocation of "gcc -shared" results in producing a DSO with only ".gnu.hash". The new ".gnu.hash" sections need to be dealt with the same way as ".hash" sections in all respects; only the dynamic linker cares about their contents. To work with older dynamic linkers (i.e. preexisting releases of glibc), a binary must have the old ".hash" section. The --hash-style=both option produces binaries that a new dynamic linker can use more efficiently, but an old dynamic linker can still handle. The new section runs afoul of the custom linker scripts used to build vDSO images for the kernel. On ia64, the failure mode for this is a boot-time panic because the vDSO's PT_IA_64_UNWIND segment winds up ill-formed. This patch addresses the problem in two ways. First, it mentions ".gnu.hash" in all the linker scripts alongside ".hash". This produces correct vDSO images with --hash-style=sysv (or old tools), with --hash-style=gnu, or with --hash-style=both. Second, it passes the --hash-style=sysv option when building the vDSO images, so that ".gnu.hash" is not actually produced. This is the most conservative choice for compatibility with any old userland. There is some concern that some ancient glibc builds (though not any known old production system) might choke on --hash-style=both binaries. The optimizations provided by the new style of hash section do not really matter for a DSO with a tiny number of symbols, as the vDSO has. If someone wants to use =gnu or =both for their vDSO builds and worry less about that compatibility, just change the option and the linker script changes will make any choice work fine. Signed-off-by: Roland McGrath Cc: "Luck, Tony" Cc: Kyle McMartin Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Jeff Dike Cc: Andi Kleen Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 072d3d1acb452f4abd8d3d20af661f2e28854b59 tree 601f384e86afc5e8a24bbf3c836e30e686daad00 parent 58690664456b597796e58958861f365e096a1609 author Michael Buesch Sun, 30 Jul 2006 03:04:05 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:43 -0700 [PATCH] hwrng: fix geode probe error unwind The geode hwrng leaks an iomapped resource, if hwrng_register() fails. This fixes it. Signed-off-by: Michael Buesch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 58690664456b597796e58958861f365e096a1609 tree fd10e9cbe3ebe7a40086e147e982b3be81d90924 parent b8008b2bc21fb13b45964e21247f18c013d6e985 author Michael Buesch Sun, 30 Jul 2006 03:04:04 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:43 -0700 [PATCH] hwrng: fix intel probe error unwind The intel hwrng leaks an iomapped resource, if hwrng_register() failes. This fixes it. Signed-off-by: Michael Buesch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8008b2bc21fb13b45964e21247f18c013d6e985 tree e939d1b02ce1e2c7b2432a385d13a105b1bc6414 parent d07fe82c24daab2360e2790f488bcffa7db74825 author Rolf Eike Beer Sun, 30 Jul 2006 03:04:04 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:43 -0700 [PATCH] Fix kmem_cache_alloc() been documented twice kmem_cache_alloc() was documented twice, but kmem_cache_zalloc() never. Fix this obvious typo to get things right. Signed-off-by: Rolf Eike Beer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d07fe82c24daab2360e2790f488bcffa7db74825 tree 9fa6c2550b7ec62c617c03f33ceabc640973631c parent 0d94df56963251d896e87c6197f6df132593232b author Steven Rostedt Sun, 30 Jul 2006 03:04:03 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:43 -0700 [PATCH] reference rt-mutex-design in rtmutex.c In order to prevent Doc Rot, this patch adds a reference to the design document for rtmutex.c in rtmutex.c. So when someone needs to update or change the design of that file they will know that a document actually exists that explains the design (helping them change it), and hopefully that they will update the document if they too change the design. Signed-off-by: Steven Rostedt Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d94df56963251d896e87c6197f6df132593232b tree 2b87f030b4e591e63a8a1d1c636145030e221660 parent 3c829c367a1a52550378584a657768217971e587 author Uwe Zeisberger Sun, 30 Jul 2006 03:04:02 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:43 -0700 [PATCH] Add parentheses around arguments in the SH_DIV macro. There is currently no affected user in the tree, but usage is less surprising that way. Signed-off-by: Uwe Zeisberger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c829c367a1a52550378584a657768217971e587 tree 78dfcbe28e6a0db56992ce5ad5891398a9743bf4 parent 953a7f20667a8b6217ea2ac49c0877e957a0130a author Tim Chen Sun, 30 Jul 2006 03:04:02 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:42 -0700 [PATCH] Reducing local_bh_enable/disable overhead in irqtrace The recent changes from irqtrace feature has added overheads to local_bh_disable and local_bh_enable that reduces UDP performance across x86_64 and IA64, even though IA64 does not support the irqtrace feature. Patch in question is [PATCH]lockdep: irqtrace subsystem, core http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=c ommit;h=de30a2b355ea85350ca2f58f3b9bf4e5bc007986 Prior to this patch, local_bh_disable was a short macro. Now it is a function which calls __local_bh_disable with added irq flags save and restore. The irq flags save and restore were also added to local_bh_enable, probably for injecting the trace irqs code. This overhead is on the generic code path across all architectures. On a IA_64 test machine (Itanium-2 1.6 GHz) running a benchmark like netperf's UDP streaming test, the added overhead results in a drop of 3% in throughput, as udp_sendmsg calls the local_bh_enable/disable several times. Other workloads that have heavy usages of local_bh_enable/disable could also be affected. The patch ideally should not have affected IA-64 performance as it does not have IRQ tracing support. A significant portion of the overhead is in the added irq flags save and restore, which I think is not needed if IRQ tracing is unused. A suggested patch is attached below that recovers the lost performance. However, the "ifdef"s in the patch are a bit ugly. Signed-off-by: Tim Chen Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 953a7f20667a8b6217ea2ac49c0877e957a0130a tree 4b61b0bb8caa2621ae05f6f4f89986af5a04f056 parent de456d371d16e28d61eda813fd2a6f34fd8a8bb5 author Pete Zaitcev Sun, 30 Jul 2006 03:04:01 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:42 -0700 [PATCH] Typo in ub clause of devices.txt Change "Thrid" into "Third", and realign similarly to other entries. Signed-off-by: Pete Zaitcev Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit de456d371d16e28d61eda813fd2a6f34fd8a8bb5 tree 395d63111abf04c36b62c8a52906cb5a256b7bbd parent 344fe78669d2d1cff9e8939598f6d0d865b6a75b author Josh Triplett Sun, 30 Jul 2006 03:04:00 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:42 -0700 [PATCH] Fix typo in MAINTAINERS: s/DEVICS/DEVICES/ Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 344fe78669d2d1cff9e8939598f6d0d865b6a75b tree 1b5dc1e8edd1e67ab4d87ed05e43bea527129b91 parent 0bee8d28496a8c76b488a2c29e01a0ebc1411475 author Josh Triplett Sun, 30 Jul 2006 03:03:59 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:42 -0700 [PATCH] ufs: remove incorrect unlock_kernel from failure path in ufs_symlink() ufs_symlink, in one of its error paths, calls unlock_kernel without ever having called lock_kernel(); fix this by creating and jumping to a new label out_notlocked rather than the out label used after calling lock_kernel(). Signed-off-by: Josh Triplett Cc: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bee8d28496a8c76b488a2c29e01a0ebc1411475 tree f0b72e16f424edfadc43fc44bcb7625f25b195ce parent 0aa9e4f147880b2d7d1eef1f0b45112af0e36f9f author Josh Triplett Sun, 30 Jul 2006 03:03:58 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:42 -0700 [PATCH] efs: add entry for EFS filesystem to MAINTAINERS as Orphan The EFS filesystem does not have an entry in MAINTAINERS; add one, giving the EFS filesystem and listing the status as Orphan, per the note on that page saying "I'm no longer actively maintaining EFS". Signed-off-by: Josh Triplett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0aa9e4f147880b2d7d1eef1f0b45112af0e36f9f tree 2353795f3b72fc0fc5bffd1584bc3f45d82a775e parent 6ecbc4e1a395062a8e99e4f5fe328f6ba166d9c8 author Josh Triplett Sun, 30 Jul 2006 03:03:58 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:41 -0700 [PATCH] efs: Remove incorrect unlock_kernel from failure path in efs_symlink_readpage() If efs_symlink_readpage hits the -ENAMETOOLONG error path, it will call unlock_kernel without ever having called lock_kernel(); fix this by creating and jumping to a new label fail_notlocked rather than the fail label used after calling lock_kernel(). Signed-off-by: Josh Triplett Cc: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ecbc4e1a395062a8e99e4f5fe328f6ba166d9c8 tree 860b84b861fb6b96a3ffac777ad806f89a7c9e34 parent 3ae192080cb4d007792d13522efa98ebe7f15475 author Josh Triplett Sun, 30 Jul 2006 03:03:56 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:41 -0700 [PATCH] Remove incorrect unlock_kernel from allocation failure path in coda_open() Commit 398c53a757702e1e3a7a2c24860c7ad26acb53ed (in the historical GIT tree) moved the lock_kernel() in coda_open after the allocation of a coda_file_info struct, but left an unlock_kernel() in the allocation failure error path; remove it. Signed-off-by: Josh Triplett Acked-by: Jan Harkes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ae192080cb4d007792d13522efa98ebe7f15475 tree 98786f16ad5946c907b17b6c46be1076349a4a3c parent 5b6509aa8c2f292caea7c0602ec361f920951508 author Ondrej Zary Sun, 30 Jul 2006 03:03:55 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:41 -0700 [PATCH] Fix swsusp with PNP BIOS swsusp is unable to suspend my machine (DTK FortisPro TOP-5A notebook) with kernel 2.6.17.5 because it's unable to suspend PNP device 00:16 (mouse). The problem is in PNP BIOS. pnp_bus_suspend() calls pnp_stop_dev() for the device if the device can be disabled according to pnp_can_disable(). The problem is that pnpbios_disable_resources() returns -EPERM if the device is not dynamic (!pnpbios_is_dynamic()) but insert_device() happily sets PNP_DISABLE capability/flag even if the device is not dynamic. So we try to disable non-dynamic devices which will fail. This patch prevents insert_device() from setting PNP_DISABLE if the device is not dynamic and fixes suspend on my system. Signed-off-by: Ondrej Zary Cc: Pavel Machek Cc: "Rafael J. Wysocki" Cc: Bjorn Helgaas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b6509aa8c2f292caea7c0602ec361f920951508 tree 0edf596a30b5e121c16d1868a0a284eced177f58 parent 70ea91f17f7454bc7a285817e883eace2597984f author Arjan van de Ven Sun, 30 Jul 2006 03:03:54 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:41 -0700 [PATCH] inotify: fix deadlock found by lockdep This is a real deadlock, a nice complex one: (warning: long explanation follows so that Andrew can have a complete patch description) it's an ABCDA deadlock: A iprune_mutex B inode->inotify_mutex C ih->mutex D dev->ev_mutex The AB relationship comes straight from invalidate_inodes() int invalidate_inodes(struct super_block * sb) { int busy; LIST_HEAD(throw_away); mutex_lock(&iprune_mutex); spin_lock(&inode_lock); inotify_unmount_inodes(&sb->s_inodes); where inotify_umount_inodes() takes the mutex_lock(&inode->inotify_mutex); The BC relationship comes directly from inotify_find_update_watch(): s32 inotify_find_update_watch(struct inotify_handle *ih, struct inode *inode, u32 mask) { ... mutex_lock(&inode->inotify_mutex); mutex_lock(&ih->mutex); The CD relationship comes from inotify_rm_wd: inotify_rm_wd does mutex_lock(&inode->inotify_mutex); mutex_lock(&ih->mutex) and then calls inotify_remove_watch_locked() which calls notify_dev_queue_event() which does mutex_lock(&dev->ev_mutex); (this strictly is a BCD relationship) The DA relationship comes from the most interesting part: [] shrink_icache_memory+0x42/0x270 [] shrink_slab+0x11d/0x1c9 [] try_to_free_pages+0x187/0x244 [] __alloc_pages+0x1cd/0x2e0 [] cache_alloc_refill+0x3f8/0x821 [] kmem_cache_alloc+0x85/0xcb [] kernel_event+0x2e/0x122 [] inotify_dev_queue_event+0xcc/0x140 inotify_dev_queue_event schedules a kernel_event which does a kmem_cache_alloc( , GFP_KERNEL) which may try to shrink slabs, including the inode cache .. which then takes iprune_mutex. And voila, there is an AB, a BC, a CD relationship (even a direct BCD), and also now a DA relationship -> a circular type AB-BA deadlock but involving 4 locks. The solution is simple: kernel_event() is NOT allowed to use GFP_KERNEL, but must use GFP_NOFS to not cause recursion into the VFS. Signed-off-by: Arjan van de Ven Acked-by: Ingo Molnar Acked-by: Robert Love Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70ea91f17f7454bc7a285817e883eace2597984f tree eb835100afefb4b86f431efd6cbb00f9d2d2e611 parent b50f60ceeef2e38e529737c0260d9543939915ad author Steven Rostedt Sun, 30 Jul 2006 03:03:53 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:41 -0700 [PATCH] Add linux-mm mailing list for memory management in MAINTAINERS file Since I didn't know about the linux-mm mailing list until I spammed all those that had their names anywhere in the mm directory, I'm sending this patch to add the linux-mm mailing list to the MAINTAINERS file. Also, since mm is so broad, it doesn't have a single person to maintain it, and thus no maintainer is listed. I also left the status as Maintained, since it obviously is. Signed-off-by: Steven Rostedt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b50f60ceeef2e38e529737c0260d9543939915ad tree 608880dd1c9d1751eceea9f21f7f1d2898ea917f parent a04b61d3dc68857dcc81a5761268c96056742fb2 author Heiko Carstens Sun, 30 Jul 2006 03:03:52 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:41 -0700 [PATCH] pi-futex: missing pi_waiters plist initialization Initialize init task's pi_waiters plist. Otherwise cpu hotplug of cpu 0 might crash, since rt_mutex_getprio() accesses an uninitialized list head. call chain which led to crash: take_cpu_down sched_idle_next __setscheduler rt_mutex_getprio Using PLIST_HEAD_INIT in the INIT_TASK macro doesn't work unfortunately, since the pi_waiters member is only conditionally present. Cc: Arjan van de Ven Cc: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a04b61d3dc68857dcc81a5761268c96056742fb2 tree d153fe1763095038569790e1640fddb2d437903a parent cfa224e928f782e1593b5222688fad84c2cad3e8 author Olaf Hering Sun, 30 Jul 2006 03:03:52 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:41 -0700 [PATCH] hide onboard graphics drivers on G5 Hide the video drivers for onboard graphics found in early PCI PowerMacs in Apple G5 config files. drivers/built-in.o: In function `.platinumfb_probe': platinumfb.c:(.text+0x377a0): undefined reference to `.nvram_read_byte' platinumfb.c:(.text+0x37830): undefined reference to `.nvram_read_byte' drivers/built-in.o: In function `.control_init': controlfb.c:(.init.text+0x1938): undefined reference to `.nvram_read_byte' controlfb.c:(.init.text+0x1968): undefined reference to `.nvram_read_byte' drivers/built-in.o: In function `.valkyriefb_init': (.init.text+0x2300): undefined reference to `.nvram_read_byte' drivers/built-in.o:(.init.text+0x239c): more undefined references to `.nvram_read_byte' follow Signed-off-by: Olaf Hering Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfa224e928f782e1593b5222688fad84c2cad3e8 tree 0cc0033b9c29f4893bb50375476ed5e887563b7b parent 47a31976cadb9a2d25a2896762cb0e678470a29b author Olaf Hering Sun, 30 Jul 2006 03:03:51 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:41 -0700 [PATCH] enable mac partition label per default on pmac Enable mac partition table support per default also for a powermac config. Signed-off-by: Olaf Hering Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47a31976cadb9a2d25a2896762cb0e678470a29b tree 750eb8379b57bbcbba5b0e330b686482d4141ccc parent f47ad214926b1dbcc591fd71562e36f1529936b5 author Daniel Ritz Sun, 30 Jul 2006 03:03:49 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:41 -0700 [PATCH] pcmcia: fix ioctl GET_CONFIGURATION_INFO for pcmcia_cards Values displayed when by cardctl config are horribly wrong for 16bit cards. this fixes it up by not using memcpy() since source and target struct are very different. Signed-off-by: Daniel Ritz Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f47ad214926b1dbcc591fd71562e36f1529936b5 tree ca96cdcec260e0d8f3b83ae44eec4a3c701dc3a3 parent 7ca7b5c42e783b74a57387418bfcfea072fc46d6 author Daniel Ritz Sun, 30 Jul 2006 03:03:47 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:41 -0700 [PATCH] pcmcia: fix ioctl for GET_STATUS and GET_CONFIGURATION_INFO the p_dev == NULL checks are wrong. the called functions handle a NULL p_dev on their own. w/o this patch output of cardcctl status and cardctl config is broken for cardbus cards or when the slot is empty. Signed-off-by: Daniel Ritz Cc: Dominik Brodowski Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ca7b5c42e783b74a57387418bfcfea072fc46d6 tree 6dfb6066c79668104f353d804effbd511b74c44c parent 9578bcf4ecaf447cb4bb0891309fad73ff5c00e3 author Frederik Deweerdt Sun, 30 Jul 2006 03:03:46 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:40 -0700 [PATCH] mdacon: fix __init section warnings WARNING: drivers/video/console/mdacon.o - Section mismatch: reference to .init.text: from .text between 'mdacon_startup' (at offset 0x123) and 'mdacon_init' WARNING: drivers/video/console/mdacon.o - Section mismatch: reference to .init.text: from .text between 'mdacon_startup' (at offset 0x18b) and 'mdacon_init' Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9578bcf4ecaf447cb4bb0891309fad73ff5c00e3 tree ec127f457cbeeff46d2d4c8e76de9afcec630c8a parent bc7455fa3b5ada2a47d24755cc431f4dfff052cb author Brent Casavant Sun, 30 Jul 2006 03:03:46 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:40 -0700 [PATCH] sgiioc4: Always share IRQ The SGI IOC4 IDE device always shares an interrupt with other devices which are part of IOC4. As such, IDEPCI_SHARE_IRQ should always be enabled when BLK_DEV_SGIIOC4 is enabled. Signed-off-by: Brent Casavant Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc7455fa3b5ada2a47d24755cc431f4dfff052cb tree 6cad57aab9bf3695694183ab6b22efd6e29790af parent 0fcb78c22f06340cdba884d7381adb3a0148bbb6 author Randy Dunlap Sun, 30 Jul 2006 03:03:45 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:40 -0700 [PATCH] Doc/SubmittingPatches cleanups A few cleanups to SubmittingPatches: - mention SubmitChecklist - remove mention of my simple patch script tools - remove last-updated line Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fcb78c22f06340cdba884d7381adb3a0148bbb6 tree 565c221a078fc7271d09fd4ad9453c4a2d76f485 parent d75763d24063cafe28ace8863560da9c968ee099 author Rolf Eike Beer Sun, 30 Jul 2006 03:03:42 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:40 -0700 [PATCH] Add DocBook documentation for workqueue functions kernel/workqueue.c was omitted from generating kernel documentation. This adds a new section "Workqueues and Kevents" and adds documentation for some of the functions. Some functions in this file already had DocBook-style comments, now they finally become visible. Signed-off-by: Rolf Eike Beer Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d75763d24063cafe28ace8863560da9c968ee099 tree bfeb570a55b31d1531551faa9240f7eb50ddae1d parent 0129a057b652b33dba6406a940af061cf0f36f79 author Randy Dunlap Sun, 30 Jul 2006 03:03:41 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:40 -0700 [PATCH] pci/search: cleanups, add to kernel-api.tmpl Clean up kernel-doc comments in drivers/pci/search.c (line sizes and typos). Enable that source file in DocBook/kernel-api.tmpl. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0129a057b652b33dba6406a940af061cf0f36f79 tree 27a31c64d36f5ced5d9d285fe217bb772b33dd55 parent 2b54960bdf8fbb57d94dd61f4ac7513535ca7168 author Randy Dunlap Sun, 30 Jul 2006 03:03:41 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:40 -0700 [PATCH] kernel-doc: ignore __devinit Ignore __devinit in function definitions so that kernel-doc won't fail on them. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b54960bdf8fbb57d94dd61f4ac7513535ca7168 tree aa755474c12a839a77210c91e50047f04fc26546 parent 2d7d253548cffdce80f4e03664686e9ccb1b0ed7 author Randy Dunlap Sun, 30 Jul 2006 03:03:40 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:40 -0700 [PATCH] fix kernel-api doc for kernel/resource.c insert_resource() was unexported, so kernel-doc needs to be told to search kernel/resource.c for internal functions instead of exported functions so that it won't report an error. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d7d253548cffdce80f4e03664686e9ccb1b0ed7 tree 08771f36c2506e39f9adfc0bb09e4a574ce196dd parent 6ea24f9ad18c65cc179593b5cc2a88cdadf8cc0c author Jim Houston Sun, 30 Jul 2006 03:03:39 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:40 -0700 [PATCH] fix cond_resched() fix In cond_resched_lock() it calls __resched_legal() before dropping the spin lock. __resched_legal() will always finds the preempt_count non-zero and will prevent the call to __cond_resched(). The attached patch adds a parameter to __resched_legal() with the expected preempt_count value. Cc: Ingo Molnar Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ea24f9ad18c65cc179593b5cc2a88cdadf8cc0c tree 7a47cc8e18a6f25b4af0560282d8a0315f72241d parent be6b5a3505fa0cd54c3b5959a39293f47c648980 author Steven Rostedt Sun, 30 Jul 2006 03:03:38 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:40 -0700 [PATCH] fix bad macro param in timer.c We have #define INDEX(N) (base->timer_jiffies >> (TVR_BITS + N * TVN_BITS)) & TVN_MASK and it's used via list = varray[i + 1]->vec + (INDEX(i + 1)); So, due to underparenthesisation, this INDEX(i+1) is now a ... (TVR_BITS + i + 1 * TVN_BITS)) ... So this bugfix changes behaviour. It worked before by sheer luck: "If i was anything but 0, it was broken. But this was only used by s390 and arm. Since it was for the next interrupt, could that next interrupt be a problem (going into the second cascade)? But it was probably seldom wrong. That is, this would fail if the next interrupt was in the second cascade, and was wrapped. Which may never of happened. Also if it did happen, it would have just missed the interrupt. If an interrupt was missed, and no one was there to miss it, was it really missed :-)" Signed-off-by: Steven Rostedt Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be6b5a3505fa0cd54c3b5959a39293f47c648980 tree a7171d3dc5acf71c21f954b5c4f4906904873a0b parent 7c7165c90801609b70492e50b2a9c69a677c573a author Chandra Seetharaman Sun, 30 Jul 2006 03:03:37 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:39 -0700 [PATCH] cpu hotplug: use hotplug version of registration in late inits Use hotplug version of register_cpu_notifier in late init functions. Signed-off-by: Chandra Seetharaman Cc: "Luck, Tony" Cc: Martin Schwidefsky Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c7165c90801609b70492e50b2a9c69a677c573a tree 59e1f38d0cab4f0fa57b6b6cbd196417d5333e7f parent 8c78f3075dab4be279e283f901f00e33ce44890a author Chandra Seetharaman Sun, 30 Jul 2006 03:03:36 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:39 -0700 [PATCH] cpu hotplug: fix hotplug cpu documentation for proper usage Update hotplug cpu documentation to clearly state when to use register_cpu_notifier() and register_hotcpu_notifier. Signed-off-by: Chandra Seetharaman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c78f3075dab4be279e283f901f00e33ce44890a tree 034d667a713b24d39608b09bd2aafb7983fb6ba5 parent cea6a4ba8acfba6f59cc9ed71e0d05cb770b9d9c author Chandra Seetharaman Sun, 30 Jul 2006 03:03:35 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:39 -0700 [PATCH] cpu hotplug: replace __devinit* with __cpuinit* for cpu notifications Few of the callback functions and notifier blocks that are associated with cpu notifications incorrectly have __devinit and __devinitdata. They should be __cpuinit and __cpuinitdata instead. It makes no functional difference but wastes text area when CONFIG_HOTPLUG is enabled and CONFIG_HOTPLUG_CPU is not. This patch fixes all those instances. Signed-off-by: Chandra Seetharaman Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cea6a4ba8acfba6f59cc9ed71e0d05cb770b9d9c tree 8a8ad7de11c2261c3f850d97d91524ee64cc36c4 parent b8bdb460b7ecf08a4fed6e8b5b6b3fe874587aaa author Horms Sun, 30 Jul 2006 03:03:34 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:39 -0700 [PATCH] panic_on_oops: remove ssleep() This patch is part of an effort to unify the panic_on_oops behaviour across all architectures that implement it. It was pointed out to me by Andi Kleen that if an oops has occured in interrupt context, then calling sleep() in the oops path will only cause a panic, and that it would be really better for it not to be in the path at all. This patch removes the ssleep() call and reworks the console message accordinly. I have a slght concern that the resulting console message is too long, feedback welcome. For powerpc it also unifies the 32bit and 64bit behaviour. Fror x86_64, this patch only updates the console message, as ssleep() is already not present. Signed-off-by: Horms Acked-by: Paul Mackerras Cc: Russell King Cc: "Luck, Tony" Cc: Andi Kleen Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8bdb460b7ecf08a4fed6e8b5b6b3fe874587aaa tree b8af674bcf24fef76dfb8f031715188824cf84ae parent f0df33bcab4b687f0f18b9ebd69d374642e46a0e author Yoichi Yuasa Sun, 30 Jul 2006 03:03:33 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:39 -0700 [PATCH] always define IRQ_PER_CPU Reduce the likelihood of someone accidentally introducing namespace collisions. Signed-off-by: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0df33bcab4b687f0f18b9ebd69d374642e46a0e tree 808ecf0e290eb67063fd1d42af53ed611b486590 parent e4b57e0842621f597d744b193ea325d62724596b author Michal Feix Sun, 30 Jul 2006 03:03:32 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:39 -0700 [PATCH] nbd: Abort request on data reception failure When reading from nbd device, we need to receive all the data after receiving reply packet from the server - otherwise such request will never be ended. If socket is closed right after accepting reply control packet and in the middle of waiting for read data, nbd_read_stat() returns NULL and nbd_end_request() is not called. This patch fixes it. Signed-off-by: Michal Feix Acked-by: Paul Clements Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e4b57e0842621f597d744b193ea325d62724596b tree 0cb75aac6d4452d95dfe8ab1931bed45b1246bb9 parent 8e185d83398b2708f50207bc12d0e0a70bd70767 author Michal Feix Sun, 30 Jul 2006 03:03:31 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:39 -0700 [PATCH] nbd: Check magic before doing anything else We should check magic sequence in reply packet before trying to find request with it's request handle. This also solves the problem with "Unexpected reply" message beeing logged, when packet with invalid magic is received. Signed-off-by: Michal Feix Acked-by: Paul Clements Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e185d83398b2708f50207bc12d0e0a70bd70767 tree b7c9e7b9151a409eb55cb3c4a60da6b8dc36cb6d parent 1e86240f3fd33f8052141778ad3dffe2c96184d7 author Arjan van de Ven Sun, 30 Jul 2006 03:03:30 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:39 -0700 [PATCH] lockdep: annotate pktcdvd natural device hierarchy The pkt_*_dev functions operate on not-this-blockdevice, and that is sufficiently checked at setup time. As a result there is a natural hierarchy, which needs nesting annotations Signed-off-by: Arjan van de Ven Cc: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e86240f3fd33f8052141778ad3dffe2c96184d7 tree 70d177ecd0b28480b0099e0b5a81b51f8cdfb7be parent 0e1dfc66b6ec94984a4778132147a8aa36461d58 author Michal Schmidt Sun, 30 Jul 2006 03:03:29 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:39 -0700 [PATCH] IDE: Touch NMI watchdog during resume from STR When resuming from suspend-to-RAM, the NMI watchdog detects a lockup in ide_wait_not_busy. Here's a screenshot of the trace taken by a digital camera: http://www.uamt.feec.vutbr.cz/rizeni/pom/DSC03510-2.JPG Let's touch the NMI watchdog in ide_wait_not_busy. The system then resumes correctly from STR. [akpm@osdl.org: modular build fix] Signed-off-by: Michal Schmidt Acked-by: Alan Cox Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e1dfc66b6ec94984a4778132147a8aa36461d58 tree 225a8e044e021a5a337704bc1f5ea862a5f75375 parent a268cefebceeb2046dfdfa301f041c2468536852 author Andrew Morton Sun, 30 Jul 2006 03:03:28 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:38 -0700 [PATCH] invalidate_bdev() speedup We can immediately bail from invalidate_bdev() if the blockdev has no pagecache. This solves the huge IPI storms which hald is causing on the big ia64 machines when it polls CDROM drives. Acked-by: Jes Sorensen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a268cefebceeb2046dfdfa301f041c2468536852 tree 62b5bc24a96384f96ae99b1ddc16009ee0a2050e parent 66f6b24be91fcc31259e8219286ae462ae64ea55 author Miles Bader Sun, 30 Jul 2006 03:03:28 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:38 -0700 [PATCH] v850: call init_page_count() instead of set_page_count() Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66f6b24be91fcc31259e8219286ae462ae64ea55 tree 2e4595a46c9463c0ee1043905a1b29b5bff1ddeb parent a9ad965ea9a6d719daf333847a2ceb0e363994bd author Miles Bader Sun, 30 Jul 2006 03:03:27 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:38 -0700 [PATCH] v850: Remove symbol exports which duplicate global ones Signed-off-by: Miles Bader Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9ad965ea9a6d719daf333847a2ceb0e363994bd tree 9ecb71f533c16eb790909f13fefd67fd939ffb2b parent 25c8716cb08dea386c7d6220b82eba732ccbf976 author bibo, mao Sun, 30 Jul 2006 03:03:26 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:38 -0700 [PATCH] IA64: kprobe invalidate icache of jump buffer Kprobe inserts breakpoint instruction in probepoint and then jumps to instruction slot when breakpoint is hit, the instruction slot icache must be consistent with dcache. Here is the patch which invalidates instruction slot icache area. Without this patch, in some machines there will be fault when executing instruction slot where icache content is inconsistent with dcache. Signed-off-by: bibo,mao Acked-by: "Luck, Tony" Acked-by: Keshavamurthy Anil S Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25c8716cb08dea386c7d6220b82eba732ccbf976 tree ec5a4d986440b5c93186fafb4ebc0f4f1ad44dcc parent c8e5429e49dcf5243a2dc293cb11f53d65d5fca9 author Tobias Klauser Sun, 30 Jul 2006 03:03:23 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:38 -0700 [PATCH] arch/alpha: Use ARRAY_SIZE macro Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove a duplicate of the macro. Also remove some trailing whitespaces and needless braces. Signed-off-by: Tobias Klauser Cc: Richard Henderson Cc: Ivan Kokshaysky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8e5429e49dcf5243a2dc293cb11f53d65d5fca9 tree 2f3bcbb6ffdb94cbcbc2a03d33261a5f7aa8e7c7 parent c39df470e04822965d945473d831786ab79dd4cd author Arthur Othieno Sun, 30 Jul 2006 03:03:22 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:38 -0700 [PATCH] i386: fix CONFIG_EFI help It is described as being experimental, but doesn't actually depend on EXPERIMENTAL. Change the text. Signed-off-by: Arthur Othieno Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c39df470e04822965d945473d831786ab79dd4cd tree 5a16bc4b29c71d9ae3cd234995c66daedc85e6bf parent 2a8a3d5b65e86ec1dfef7d268c64a909eab94af7 author Masami Hiramatsu Sun, 30 Jul 2006 03:03:21 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:38 -0700 [PATCH] kprobe-booster: disable in preemptible kernel The kprobe-booster's safety check against preemption does not work well now, because the preemption count has been modified by read_rcu_lock() in atomic_notifier_call_chain() before we check it. So, I'd like to prevent boosting kprobe temporarily if the kernel is preemptable. Now we are searching for the good solution. Signed-off-by: Masami Hiramatsu Cc: Ananth N Mavinakayanahalli Cc: Prasanna S Panchamukhi Cc: Anil S Keshavamurthy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a8a3d5b65e86ec1dfef7d268c64a909eab94af7 tree 90d4f3e42233c4b9e0385a114b5e22ddda6b57e8 parent c35a7261eaf0e57924e2c56c6d72dc44ee9f3634 author Eric W. Biederman Sun, 30 Jul 2006 03:03:20 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:38 -0700 [PATCH] machine_kexec.c: Fix the description of segment handling One of my original comments in machine_kexec was unclear and this should fix it. Signed-off-by: Eric W. Biederman Cc: Andi Kleen Acked-by: Horms Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c35a7261eaf0e57924e2c56c6d72dc44ee9f3634 tree cb59f2b3ca4b7705ee715824d0e8aeb37454de57 parent 851f8a6906b71f7a19043d4d722dd4ffab7aeafc author Andrew Morton Sun, 30 Jul 2006 03:03:19 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:38 -0700 [PATCH] synchronize_tsc() fixes - Move the tsc synchronisation variables into a struct, mark it __initdata - local `realdelta' wants to be 64-bit - Print the skew for negative skews, as well as for positive ones - remove dead code Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 851f8a6906b71f7a19043d4d722dd4ffab7aeafc tree 2d1c8c23b1ab70095f442f93ecb5629c273390ee parent ddccef3b5ec906ff181171e8ffad4fcb996792fd author Venkat Yekkirala Sun, 30 Jul 2006 03:03:18 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:38 -0700 [PATCH] selinux: fix bug in security_compute_sid Initializes newcontext sooner to allow for its destruction in all cases. Signed-off-by: Venkat Yekkirala Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddccef3b5ec906ff181171e8ffad4fcb996792fd tree fd65ff65baf451983c862b4a3a8c08e925ca5629 parent d1bbf14f37261c2c0dba71404602e1ddcec069d2 author Darrel Goeddel Sun, 30 Jul 2006 03:03:17 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:37 -0700 [PATCH] selinux: fix memory leak This patch fixes a memory leak when a policydb structure is destroyed. Signed-off-by: Darrel Goeddel Signed-off-by: Stephen Smalley Acked-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1bbf14f37261c2c0dba71404602e1ddcec069d2 tree 7b01141c31b73f277079cbcdb88be6ac8da2add1 parent a5ca63cb60892c1703998daf80d2d1b04cb70103 author NeilBrown Sun, 30 Jul 2006 03:03:16 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:37 -0700 [PATCH] knfsd: Fix stale file handle problem with subtree_checking. A recent commit (7fc90ec93a5eb71f4b08403baf5ba7176b3ec6b1) moved the call to nfsd_setuser out of the 'find a dentry for a filehandle' branch of fh_verify so that it would always be called. This had the unfortunately side-effect of moving *after* the call to decode_fh, so the prober fsuid was not set when nfsd_acceptable was called, the 'permission' check did the wrong thing. This patch moves the nfsd_setuser call back where it was, and add as call in the other branch of the if. Cc: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5ca63cb60892c1703998daf80d2d1b04cb70103 tree 9a265ce1ac462515aaa67c0f0c0424a37addc422 parent 31925c8857ba17c11129b766a980ff7c87780301 author Andrew Morton Sun, 30 Jul 2006 03:03:16 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:37 -0700 [PATCH] mce section fix mce_disabled cannot be __initdata - we access it during APM resume. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31925c8857ba17c11129b766a980ff7c87780301 tree a82ee8700076f19072780341c0aab35cee61b7eb parent 163ecdff060f2fa9e8f5238882fd0137493556a6 author Peter Korsgaard Sun, 30 Jul 2006 03:03:12 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:37 -0700 [PATCH] Fix ppc32 zImage inflate The recent zlib update (commit 4f3865fb57a04db7cca068fed1c15badc064a302) broke ppc32 zImage decompression as it tries to decompress to address zero and the updated zlib_inflate checks that strm->next_out isn't a null pointer. This little patch fixes it. [rpurdie@rpsys.net: add comment] Signed-off-by: Peter Korsgaard Acked-by: Tom Rini Signed-off-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 163ecdff060f2fa9e8f5238882fd0137493556a6 tree 955aa8397edf1ddc64a2429bc2986331c286e47c parent d94a041519f3ab1ac023bf917619cd8c4a7d3c01 author Shailabh Nagar Sun, 30 Jul 2006 03:03:11 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:37 -0700 [PATCH] delay accounting: temporarily enable by default Enable delay accounting by default so that feature gets coverage testing without requiring special measures. Earlier, it was off by default and had to be enabled via a boot time param. This patch reverses the default behaviour to improve coverage testing. It can be removed late in the kernel development cycle if its believed users shouldn't have to incur any cost if they don't want delay accounting. Or it can be retained forever if the utility of the stats is deemed common enough to warrant keeping the feature on. Signed-off-by: Shailabh Nagar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d94a041519f3ab1ac023bf917619cd8c4a7d3c01 tree 6d7d476814db70fab691242c7663204c64dbb43e parent 7d94dddd438bcba97db44f120da39bb001b5249f author Shailabh Nagar Sun, 30 Jul 2006 03:03:11 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:37 -0700 [PATCH] taskstats: free skb, avoid returns in send_cpu_listeners Add a missing freeing of skb in the case there are no listeners at all. Also remove the returning of error values by the function as it is unused by the sole caller. Signed-off-by: Shailabh Nagar Signed-off-by: Chandra Seetharaman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d94dddd438bcba97db44f120da39bb001b5249f tree edd737ba4e06ec086f0296a7d99a13e240c7ab93 parent 15a647eba94c3da27ccc666bea72e7cca06b2d19 author Shailabh Nagar Sun, 30 Jul 2006 03:03:10 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:37 -0700 [PATCH] make taskstats sending completely independent of delay accounting on/off status Complete the separation of delay accounting and taskstats by ignoring the return value of delay accounting functions that fill in parts of taskstats before it is sent out (either in response to a command or as part of a task exit). Also make delayacct_add_tsk return silently when delay accounting is turned off rather than treat it as an error. Signed-off-by: Shailabh Nagar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15a647eba94c3da27ccc666bea72e7cca06b2d19 tree b4fbc1e78cb298a36d1106847be1433553d217c8 parent 5e44ef238b7eb607532e89249e7b2523faf77a92 author David Brownell Sun, 30 Jul 2006 03:03:08 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:36 -0700 [PATCH] genirq: {en,dis}able_irq_wake() need refcounting too IRQs need refcounting and a state flag to track whether the the IRQ should be enabled or disabled as a "normal IRQ" source after a series of calls to {en,dis}able_irq(). For shared IRQs, the IRQ must be enabled so long as at least one driver needs it active. Likewise, IRQs need the same support to track whether the IRQ should be enabled or disabled as a "wakeup event" source after a series of calls to {en,dis}able_irq_wake(). For shared IRQs, the IRQ must be enabled as a wakeup source during sleep so long as at least one driver needs it. But right now they _don't have_ that refcounting ... which means sharing a wakeup-capable IRQ can't work correctly in some configurations. This patch adds the refcount and flag mechanisms to set_irq_wake() -- which is what {en,dis}able_irq_wake() call -- and minimal documentation of what the irq wake mechanism does. Drivers relying on the older (broken) "toggle" semantics will trigger a warning; that'll be a handful of drivers on ARM systems. Signed-off-by: David Brownell Acked-by: Ingo Molnar Acked-by: Thomas Gleixner Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e44ef238b7eb607532e89249e7b2523faf77a92 tree df201647247d5c831f4c59b58c182a3f53d76adb parent 822cfbff2ef49a08d1b9618d50f81b475d4f936c author Adrian Bunk Sun, 30 Jul 2006 03:03:07 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:36 -0700 [PATCH] drivers/char/pc8736x_gpio.c: unexport a static struct A static struct mustn't be exported. Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 822cfbff2ef49a08d1b9618d50f81b475d4f936c tree 9b8bd37b3940410a13d0c439cc585d5aea1147ac parent 2ccb48ebb4de139eef4fcefd5f2bb823cb0d81b9 author Chandra Seetharaman Sun, 30 Jul 2006 03:03:04 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:36 -0700 [PATCH] Process Events: Fix biarch compatibility issue. use __u64 timestamp Events sent by Process Events Connector from a 64-bit kernel are not binary compatible with a 32-bit userspace program because the "timestamp" field (struct timespec) is not arch independent. This affects the fields that follow "timestamp" as they will be be off by 8 bytes. This is a problem for 32-bit userspace programs running with 64-bit kernels on ppc64, s390, x86-64.. any "biarch" system. Matt had submitted a different solution to lkml as an RFC earlier. We have since switched to a solution recommended by Evgeniy Polyakov. This patch fixes the problem by changing the timestamp to be a __u64, which stores the number of nanoseconds. Tested on a x86_64 system with both 32 bit application and 64 bit application and on a i386 system. Signed-off-by: Chandra Seetharaman Signed-off-by: Matt Helsley Cc: Evgeniy Polyakov Cc: Guillaume Thouvenin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ccb48ebb4de139eef4fcefd5f2bb823cb0d81b9 tree e06a83c7306e143175a87df2328b45e1ef34da5b parent f712c0c7e1796f92e45e4de144e247816d974b8f author Neil Brown Sun, 30 Jul 2006 03:03:01 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:36 -0700 [PATCH] ext3: avoid triggering ext3_error on bad NFS file handle The inode number out of an NFS file handle gets passed eventually to ext3_get_inode_block() without any checking. If ext3_get_inode_block() allows it to trigger an error, then bad filehandles can have unpleasant effect - ext3_error() will usually cause a forced read-only remount, or a panic if `errors=panic' was used. So remove the call to ext3_error there and put a matching check in ext3/namei.c where inode numbers are read off storage. [akpm@osdl.org: fix off-by-one error] Signed-off-by: Neil Brown Signed-off-by: Jan Kara Cc: Marcel Holtmann Cc: Cc: "Stephen C. Tweedie" Cc: Eric Sandeen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f712c0c7e1796f92e45e4de144e247816d974b8f tree eb830b95b462b09f1263ce004e28b724bbbf2eff parent b6ff50833ad43a8ebd9b16bf53c334f7aaf33c41 author Siddha, Suresh B Sun, 30 Jul 2006 03:02:59 -0700 committer Linus Torvalds Mon, 31 Jul 2006 13:28:36 -0700 [PATCH] sched: build_sched_domains() fix Use the correct groups while initializing sched groups power for allnodes_domain. This fixes the crash observed while creating exclusive cpusets. Signed-off-by: Suresh Siddha Reported-and-tested-by: Paul Jackson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d950cb8896fc95a9444d190885779438bb9d01c tree 63d69fd9b38b297d487ef4ca9e891ddd257fb07f parent 9b9b72fe703bd5b89533815eb7eb682cdaf60a6e author Geoff Levand Tue, 25 Jul 2006 14:05:01 -0700 committer Paul Mackerras Mon, 31 Jul 2006 14:37:46 +1000 [POWERPC] Minor comment fix for misc_64.S A minor comment fix for misc_64.S from Takao Shinohara. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 9b9b72fe703bd5b89533815eb7eb682cdaf60a6e tree 7c5d9dfce491618fbee1321ca7d65bfc42201b57 parent 9fc0a92c7ebcad96467d62077497ce195d9b741c author Jake Moilanen Tue, 25 Jul 2006 15:11:47 -0500 committer Paul Mackerras Mon, 31 Jul 2006 14:35:21 +1000 [POWERPC] Use H_CEDE on non-SMT On the JS21 systems, they have the SPLPAR hypertas set, but are not SMT capable. So, they are not making the H_CEDE call. This is causing the hypervisor to have to queue up work for the hdecr, taking an excessive amount of time in maintenance code, and causing jitter on the box. Making the H_CEDE call helps alleviate that problem. Signed-off-by: Jake Moilanen Signed-off-by: Paul Mackerras commit 9fc0a92c7ebcad96467d62077497ce195d9b741c tree 8b5824d93be7746f69f992db9e684af0962a82ab parent 4c962b5a42e5fc24e2d5d73896732cf3578da260 author Olaf Hering Wed, 19 Jul 2006 10:34:05 +0200 committer Paul Mackerras Sat, 29 Jul 2006 04:07:08 +1000 [POWERPC] force 64bit mode in fwnmi handlers to workaround firmware bugs The firmware of POWER4 and JS20 systems does not switch the cpu to 64bit mode when the registered system_reset and machine_check handlers get called. If a 32bit process runs on that cpu at the time of the event, the cpu remains in 32bit mode. xmon and kdump can not deal with it, the result is an error like 'Bad kernel stack pointer fff2aad0 at 3200'. xmon just loses some register info, but booting the kdump kernel usually fails. Both handlers are not hot paths. Duplicate the EXCEPTION_PROLOG_PSERIES macro and add two instructions to switch to 64bit: li r11,5; rldimi r10,r11,61,0; Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 4c962b5a42e5fc24e2d5d73896732cf3578da260 tree 8ca58340e79e2215cd4b9f5133e45a882fdb7534 parent 96278d21000568a9261f016e8b2569a95a2d4c9e author Danny van Dyk Tue, 11 Jul 2006 22:25:28 +0100 committer Paul Mackerras Fri, 28 Jul 2006 10:53:24 +1000 [POWERPC] PMAC_APM_EMU should depend on ADB_PMU This patch fixes undefined refereneces to pmu_ symbols on 2.6.17. Signed-Off-By: Danny van Dyk Signed-off-by: Daniel Drake Signed-off-by: Paul Mackerras commit 96278d21000568a9261f016e8b2569a95a2d4c9e tree 0dc0614f2268cdc3453fbaccba384ff0e06358f9 parent d319a03bf87209b3914fdf2ede88a2161123b3eb author Segher Boessenkool Sat, 08 Jul 2006 02:37:20 +0200 committer Paul Mackerras Fri, 28 Jul 2006 10:53:16 +1000 [POWERPC] Fix new interrupt code (MPIC detection) As the code comment already says, the Maple device-tree is incorrect here; make the Linux code detect the correct thing, too. Signed-off-by: Segher Boessenkool Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit d319a03bf87209b3914fdf2ede88a2161123b3eb tree 26f2a160d70b53a6fe422194c3916eb6d0d97198 parent e272a2853459b1e7282a7d0b54114ffaa7b3980f author Segher Boessenkool Sat, 08 Jul 2006 02:37:23 +0200 committer Paul Mackerras Fri, 28 Jul 2006 10:53:14 +1000 [POWERPC] Fix new interrupt code (MPIC endianness) All U3/U4 based systems are big-endian, not all express it in their device trees. Signed-off-by: Segher Boessenkool Acked-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit e272a2853459b1e7282a7d0b54114ffaa7b3980f tree 9579598050944e748366bab51141aac0bbcfc640 parent 8279d2e6062673f31c59ad9e2104024123154267 author Benjamin Herrenschmidt Mon, 10 Jul 2006 16:44:54 +1000 committer Paul Mackerras Fri, 28 Jul 2006 10:51:43 +1000 [POWERPC] Add cpufreq support for Xserve G5 The Xserve G5 are capable of frequency switching like other desktop G5s. This enables it. It also fix a Kconfig issue which prevented from building the G5 cpufreq support if CONFIG_PMAC_SMU was not set (the first version of that driver only worked with SMU based macs, but this isn't the case anymore). Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 8279d2e6062673f31c59ad9e2104024123154267 tree 8410692303bae0ee8d38c5c7f01e489c5c63ccd1 parent 30f30e13055d1e018c70d2b1b3ff86f8c25c511b author Benjamin Herrenschmidt Thu, 06 Jul 2006 18:03:06 +1000 committer Paul Mackerras Fri, 28 Jul 2006 10:42:49 +1000 [POWERPC] Xserve G5 thermal control fixes The thermal control for the Xserve G5s had a few issues. For one, the way to program the RPM fans speeds into the FCU is different between it and the desktop models, which I didn't figure out until recently, and it was missing a control loop for the slots fan, running it too fast. Both of those problems were causing the machine to be much more noisy than necessary. This patch also changes the fixed value of the slots fan for desktop G5s to 40% instead of 50%. It seems to still have a pretty good airflow that way and is much less noisy. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 30f30e13055d1e018c70d2b1b3ff86f8c25c511b tree cf452ba456760b40b0e3418a363b6e5b40eba6a6 parent 98c82472e98469ef23d7c680a0d6be1429540166 author Michael Ellerman Tue, 04 Jul 2006 17:13:23 +1000 committer Paul Mackerras Wed, 26 Jul 2006 01:28:24 +1000 [POWERPC] Fix mem= handling when the memory limit is > RMO size There's a bug in my cleaned up mem= handling, if the memory limit is larger than the RMO size we'll erroneously enlarge the RMO size. Fix is to only change the RMO size if the memory limit is less than the current RMO value. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 98c82472e98469ef23d7c680a0d6be1429540166 tree dd713a1389008d2c19de3f376745f56751cb5ea6 parent 45507ff3a2c58bc4781688eac1a80979ea972dce author Benjamin Herrenschmidt Tue, 04 Jul 2006 17:07:18 +1000 committer Paul Mackerras Wed, 26 Jul 2006 01:28:04 +1000 [POWERPC] More offb/bootx fixes There were still some issues with offb when BootX doesn't provide a proper display node, this fixes them. This also re-instates the palette hacks that were disabled a couple of kernel versions ago when I converted to the new OF parsing, and shuffles some functions around to avoid prototypes. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 45507ff3a2c58bc4781688eac1a80979ea972dce tree b4e6db21249a59bf03d7e63d1539166421040a75 parent 171505dafef56e4c84c48399b36604f4be55cf36 author Benjamin Herrenschmidt Tue, 04 Jul 2006 14:14:07 +1000 committer Paul Mackerras Wed, 26 Jul 2006 01:27:27 +1000 [POWERPC] Fix legacy_serial.c error handling on 32 bits The code in legacy_serial.c wouldn't properly compare OF translation results against OF_BAD_ADDR as it's using a phys_addr_t which is 32 bits on some 32-bit powerpc platforms. This fixes it by always using a u64 which is what is returned by the OF parsing routines. It also makes translation failure harmless for ISA serial ports. If they can't translate, we can't use the UART early, but we can still let the 8250 driver use it later on by using IO port accessors. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 171505dafef56e4c84c48399b36604f4be55cf36 tree 8c972f1c3306f29a373f851d4e1ba6158a927fab parent 8cffc6ac66a2b251df2490702923611aa4ac1fc5 author Benjamin Herrenschmidt Tue, 04 Jul 2006 14:11:23 +1000 committer Paul Mackerras Wed, 26 Jul 2006 01:27:13 +1000 [POWERPC] Fix default clock for udbg_16550 This patch makes it possible to provide 0 as the clock value for udbg_16550, making it default to the standard 1.8432Mhz clock Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 8cffc6ac66a2b251df2490702923611aa4ac1fc5 tree 7ae7509d009739702cab10441a61c4c36c5913a8 parent 21bd2e6696bb5c8b32b00a0ea597f49bfda0ddc6 author Benjamin Herrenschmidt Tue, 04 Jul 2006 14:09:36 +1000 committer Paul Mackerras Wed, 26 Jul 2006 01:27:04 +1000 [POWERPC] Fix non-MPIC CHRPs with CONFIG_SMP set Pseudo-CHRP machines like Pegasos without an MPIC would crash at boot if CONFIG_SMP was set because the "smp_ops" pointer was set to MPIC related ops unconditionally. This patch makes it NULL on machines that don't support SMP and provides proper default behaviour in the callers when smp_ops is NULL. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 21bd2e6696bb5c8b32b00a0ea597f49bfda0ddc6 tree eddbdd9946b73d53fd3ec9f2d608587f1e9e85ff parent f0ca330bc4ce00377f940b786d7ec7d848dc4102 author Benjamin Herrenschmidt Tue, 04 Jul 2006 14:07:42 +1000 committer Paul Mackerras Wed, 26 Jul 2006 01:26:43 +1000 [POWERPC] Fix 32 bits warning in prom_init.c A warning is hurting my eyes when building 32 bits kernels Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit f0ca330bc4ce00377f940b786d7ec7d848dc4102 tree a07461c721eb08012f3997b1a91c4d3172d4d34c parent d1a8df9136ff55e554e11ce65854c282965be8f5 author Benjamin Herrenschmidt Tue, 04 Jul 2006 14:06:29 +1000 committer Paul Mackerras Wed, 26 Jul 2006 01:26:24 +1000 [POWERPC] Workaround Pegasos incorrect ISA "ranges" The Pegasos firmware doesn't create a valid "ranges" property for the ISA bridge, thus causing translation of ISA addresses and IO ports to fail. This fixes it, thus re-enabling proper early serial console to work on Pegasos. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit d1a8df9136ff55e554e11ce65854c282965be8f5 tree c6e5c7293da0c753869342fc3a838dcc52b5ef28 parent b4e54de8d34afe7fcf08bfe91070d9dfeae6ed27 author Johannes Berg Mon, 03 Jul 2006 14:28:14 +0200 committer Paul Mackerras Wed, 26 Jul 2006 01:26:08 +1000 [POWERPC] fix up front-LED Kconfig This patch fixes the front-LED Kconfig issues I introduced while creating it. Apparently having a dependency isn't enough to have the select not evaluated or something like that. The patch also changes the default configuration for pmac32 select the default for the LED to be the IDE trigger. While I was at it, I completely updated the defconfig and also added snd-aoa to it. Signed-off-by: Johannes Berg Signed-off-by: Paul Mackerras