commit b00dc3ad74fdb676552d46ee573b88e927240d0c tree 6dcf7806f1f0fc791d3455dcf233a11088b18b3a parent 808c783e9bfb217a90be5a996a867c41a69b40bd author Hugh Dickins Tue, 21 Feb 2006 23:49:47 +0000 committer Linus Torvalds Tue, 21 Feb 2006 17:10:15 -0800 [PATCH] tmpfs: fix mount mpol nodelist parsing I've been dissatisfied with the mpol_nodelist mount option which was added to tmpfs earlier in -rc. Replace it by mpol=policy:nodelist. And it was broken: a nodelist is a comma-separated list of numbers and ranges; the mount options are a comma-separated list of token=values. Whoops, blindly strsep'ing on commas doesn't work so well: since we've no numeric tokens, and unlikely to add them, use that to distinguish. Move the mpol= parsing to shmem_parse_mpol under CONFIG_NUMA, reject all its options as invalid if not NUMA. /proc shows MPOL_PREFERRED as "prefer", so use that name for the policy instead of "preferred". Enforce that mpol=default has no nodelist; that mpol=prefer has one node only; that mpol=bind has a nodelist; but let mpol=interleave use node_online_map if no nodelist given. Describe this in tmpfs.txt. Signed-off-by: Hugh Dickins Acked-by: Robin Holt Acked-by: Andi Kleen Signed-off-by: Linus Torvalds commit 808c783e9bfb217a90be5a996a867c41a69b40bd tree 0aaeaa1a4bd4324f727e9bb9d46d29baea03e9b7 parent 52aa536f5a78bbba9205d296f53d2f8a424a3b08 parent 8db41685c73ad1893d8571861171e183a551e90d author Linus Torvalds Tue, 21 Feb 2006 10:13:22 -0800 committer Linus Torvalds Tue, 21 Feb 2006 10:13:22 -0800 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus commit 52aa536f5a78bbba9205d296f53d2f8a424a3b08 tree 29ccde2430d7dd34420761b7fde4a8c8976fe76c parent 5914811acf36c3ff091f860a6964808f668f27d0 parent 2e242fa994428bd1a40b6a7e97430413246d0a16 author Linus Torvalds Tue, 21 Feb 2006 10:11:32 -0800 committer Linus Torvalds Tue, 21 Feb 2006 10:11:32 -0800 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev commit 8db41685c73ad1893d8571861171e183a551e90d tree 2c6a368af3f0e2008940698bf29a21a5e2dc167b parent 1e93e70d035a26c0e108f0a9e8f735dabcf948ac author Ralf Baechle Tue, 21 Feb 2006 13:46:01 +0100 committer Ralf Baechle Tue, 21 Feb 2006 16:58:24 +0000 [MIPS] Disable CONFIG_ISCSI_TCP; it triggers a gcc 3.4 endless loop. Signed-off-by: Ralf Baechle commit 1e93e70d035a26c0e108f0a9e8f735dabcf948ac tree 42a37ee50c75ae5099d28ee6dde6ba55782cce6d parent 909fa64c8bf0ef20722cddaa402404fb1aa14a4a author Ralf Baechle Tue, 21 Feb 2006 00:17:50 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Yosemite: Fix build damage by dc8f6029cd51af1b148846a32e68d69013a5cc0f. Signed-off-by: Ralf Baechle commit 909fa64c8bf0ef20722cddaa402404fb1aa14a4a tree 6729397505d8039b6220c0753775ceb3918789f8 parent 1e35aabab82f8a6f7ab884b642e68be260f92f2c author Atsushi Nemoto Tue, 21 Feb 2006 01:25:06 +0900 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] jiffies_to_compat_timeval fix The last argument of div_long_long_rem() must be long. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 1e35aabab82f8a6f7ab884b642e68be260f92f2c tree 0daef6084bb1b35f40d129245579dc358df480fb parent 76e1daee7db153400aaed55646e05a312da353b3 author Rojhalat Ibrahim Mon, 20 Feb 2006 13:35:27 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Add topology_init. A recent patch introduced cpu topology in sysfs. When you run a kernel with SMP and sysfs enabled, you now get an Oops on boot. The following patch fixes that by adding topology_init to arch/mips/kernel/smp.c. The code is copied from arch/s390/kernel/smp.c. Signed-off-by: Rojhalat Ibrahim Signed-off-by: Ralf Baechle commit 76e1daee7db153400aaed55646e05a312da353b3 tree d52f863856d598283fb7334eb1944b05321f90dd parent 124273773596cbf8aa9c79304b01091d4693f368 author Martin Michlmayr Mon, 20 Feb 2006 04:57:00 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Fix compiler warnings in arch/mips/sibyte/bcm1480/irq.c Fix the following compiler warnings: CC arch/mips/sibyte/bcm1480/irq.o arch/mips/sibyte/bcm1480/irq.c: In function ‘bcm1480_set_affinity’: arch/mips/sibyte/bcm1480/irq.c:168: warning: ISO C90 forbids mixed declarations and code arch/mips/sibyte/bcm1480/irq.c: In function ‘ack_bcm1480_irq’: arch/mips/sibyte/bcm1480/irq.c:230: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Martin Michlmayr Signed-off-by: Ralf Baechle commit 124273773596cbf8aa9c79304b01091d4693f368 tree 46925c5aa94867d8a72f80275b0c57b168c95b86 parent 77607635c3f15e6bf6366e6d7db731a5cb209fb1 author Ralf Baechle Tue, 14 Feb 2006 14:22:10 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Follow Uli's latest *at syscall changes. (This really is only the half of the patch which was forgotten in 326a625748535c4cdb1c632b1dcb07030989a393 ...) Signed-off-by: Ralf Baechle commit 77607635c3f15e6bf6366e6d7db731a5cb209fb1 tree 0b5aa1613f1369c8bd2a102f8fe66640160dde0c parent 51939fbb79f66cc471f5bde9845be797ea61ad0b author Ralf Baechle Thu, 10 Nov 2005 16:32:14 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Sibyte: Config option names shouldn't be prefixed with CONFIG_ Signed-off-by: Ralf Baechle commit 51939fbb79f66cc471f5bde9845be797ea61ad0b tree 030683c83f7916c166536b171b669c5dda341533 parent f3468e0c34c8de919062582575a01e2434c8e727 author Ralf Baechle Thu, 10 Nov 2005 16:35:03 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] Sibyte: #if CONFIG_* doesn't fly. Signed-off-by: Ralf Baechle commit f3468e0c34c8de919062582575a01e2434c8e727 tree cb21a54f7b04e1408ea23016066c4c55aa3620cd parent 82ad93f4a002294820e9a5e6f84beef2222a54b7 author Ralf Baechle Sun, 19 Feb 2006 03:42:11 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:23 +0000 [MIPS] N32: Make sure pointer is good before passing it to sys_waitid(). After all we're calling sys_waitid() with fs set to KERNEL_DS ... Signed-off-by: Ralf Baechle commit 82ad93f4a002294820e9a5e6f84beef2222a54b7 tree 24423db4db76379224daeb5716fbe8b3885cd234 parent 304416da860b8cd548e61ee7038f852418008a85 author Ralf Baechle Sat, 18 Feb 2006 22:47:26 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] N32: Fix N32 rt_sigtimedwait and rt_sigsuspend breakage. Originally found through an oops in the Gentoo N32 userland build; patch based on original patch by Daniel Jacobwitz. Signed-off-by: Ralf Baechle commit 304416da860b8cd548e61ee7038f852418008a85 tree ee69d1de7bd7d4133ee934db57f74876c0a9cff6 parent dda73d0bb1d358e4337d2c4da9c61903873664cf author Ralf Baechle Sat, 18 Feb 2006 18:20:47 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] Reformat _sys32_rt_sigsuspend with tabs instead of space for consistency. Signed-off-by: Ralf Baechle commit dda73d0bb1d358e4337d2c4da9c61903873664cf tree 7e4bdd49287519899769aa40c5e2b011d401b704 parent 68fa383f3e58b5adf1d8089c93c83ab8d0d00e8d author Martin Michlmayr Sat, 18 Feb 2006 15:21:30 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] Make do_signal32 return void. do_signal has been changed to return void since the "return value is ignored everywhere". Convert do_signal32 accordingly. Signed-off-by: Martin Michlmayr Signed-off-by: Ralf Baechle commit 68fa383f3e58b5adf1d8089c93c83ab8d0d00e8d tree 56af539c87b0c2adeb66d19ec500d79ea7a93432 parent 8ecbbcaf08c13c57d6602472478739d64650ee0e author Martin Michlmayr Sat, 18 Feb 2006 14:55:45 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] Add support for TIF_RESTORE_SIGMASK for signal32 Following the recent implementation of TIF_RESTORE_SIGMASK in arch/mips/kernel/signal.c, 64-bit kernels with 32-bit user-land compatibility oops when starting init. signal32.c needs to be converted to use TIF_RESTORE_SIGMASK too. Signed-off-by: Martin Michlmayr Signed-off-by: Ralf Baechle commit 8ecbbcaf08c13c57d6602472478739d64650ee0e tree c59cf7f91e45bf95f7e9b85f43d524f3cf627505 parent 36ccf1c0e3917f1f73abc17c38ad704c59f8d1b6 author Atsushi Nemoto Tue, 14 Feb 2006 15:57:50 +0900 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] Fixes for uaccess.h with gcc >= 4.0.1 It seems current get_user() incorrectly sign-extend an unsigned int value on 64bit kernel. I think this is because '(__typeof__(val))' cast in final assignment. I suppose the cast should be '(__typeof__(*(addr))'. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 36ccf1c0e3917f1f73abc17c38ad704c59f8d1b6 tree 7f16183fafe1a1b9d37a0478d37dda0766f5a355 parent 5914811acf36c3ff091f860a6964808f668f27d0 author Ralf Baechle Tue, 14 Feb 2006 21:04:54 +0000 committer Ralf Baechle Tue, 21 Feb 2006 16:58:22 +0000 [MIPS] Make integer overflow exceptions in kernel mode fatal. Signed-off-by: Ralf Baechle commit 5914811acf36c3ff091f860a6964808f668f27d0 tree 04317a64fa5e76a13f29de655fe354abd627445d parent 6d7b9efacba9f4e5f4d5ca165b1a4350da52ddd7 author Björn Steinbrink Sat, 18 Feb 2006 18:12:43 +0100 committer Linus Torvalds Mon, 20 Feb 2006 20:27:38 -0800 [PATCH] kjournald keeps reference to namespace In daemonize() a new thread gets cleaned up and 'merged' with init_task. The current fs_struct is handled there, but not the current namespace. This adds the namespace part. [ Eric Biederman pointed out the namespace wrappers, and also notes that we can't ever count on using our parents namespace because we already have called exit_fs(), which is the only way to the namespace from a process. ] Signed-off-by: Björn Steinbrink Acked-by: Eric Biederman Signed-off-by: Linus Torvalds commit 6d7b9efacba9f4e5f4d5ca165b1a4350da52ddd7 tree df6160e759c186fe8a7321d15cc886bf142d2f91 parent cf70a6f264f6e1a4c06553699159d94996b2f916 parent 73d72cffe53407e447df0cbb0bf15a2c931108b3 author Linus Torvalds Mon, 20 Feb 2006 20:23:14 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:23:14 -0800 Merge branch 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 commit cf70a6f264f6e1a4c06553699159d94996b2f916 tree 7a5993585e7e8b80c37cae75468fca45da6519d2 parent 0b1fc9b86f49e1e73e473e06a16556ca0dce53ae parent ad6b97fc929e5844bfd1d708ab1d74d131d7960d author Linus Torvalds Mon, 20 Feb 2006 20:09:44 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:09:44 -0800 Merge branch 'fixes.b8' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird commit 0b1fc9b86f49e1e73e473e06a16556ca0dce53ae tree 0a8dae6c730dfe5279d61cdd4b5c2936f9e471a1 parent 6bd25e78211d0591060db3ece10443096ef96c50 parent b41c82eb5fb49912ce26c51ec221ba35e06c7d9b author Linus Torvalds Mon, 20 Feb 2006 20:08:23 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:08:23 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart commit 6bd25e78211d0591060db3ece10443096ef96c50 tree 95262e041c1451c8672cfcc580fc1e0e112a2603 parent 35e622a67e6d2c5f7e3d3e2da92ebdb2f46db783 parent 496b7a5159b8366b003bbc17f8c4e27f69b6779e author Linus Torvalds Mon, 20 Feb 2006 20:05:45 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:05:45 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge commit 35e622a67e6d2c5f7e3d3e2da92ebdb2f46db783 tree 724155d228e083b321899f9261a6a85a930be1b2 parent f24211e7b3e6d02251c53c48821003c77495efef author Ralf Baechle Mon, 20 Feb 2006 12:41:55 +0000 committer Linus Torvalds Mon, 20 Feb 2006 20:04:19 -0800 [PATCH] H8/300: CONFIG_CONFIG_ doesn't fly. All actual uses of the symbol refer to CONFIG_SH_STANDARD_BIOS so this option could never be activated on H8/300. Signed-off-by: Ralf Baechle Signed-off-by: Linus Torvalds commit f24211e7b3e6d02251c53c48821003c77495efef tree 1ac0e99cb2a8af160b852d2779eab712806381b7 parent cf535ea52e68e3ee6f4a90cc383faa1ee857f14d parent a8372f035aa2f6717123eb30679a08b619321dd4 author Linus Torvalds Mon, 20 Feb 2006 20:03:01 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:03:01 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit cf535ea52e68e3ee6f4a90cc383faa1ee857f14d tree 1217d6b27e99c81b4e9cf003ddd4f71a93ad0c2b parent b04ec261bd64f927bf3fce5cf9eeb0225557939d author Hirokazu Takata Mon, 20 Feb 2006 18:28:17 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:12 -0800 [PATCH] m32r: update sys_tas() routine This patch updates and fixes sys_tas() routine for m32r. In the previous implementation, a lockup rarely caused at sys_tas() routine in SMP environment. > > The problem is that touching *addr will generate an oops if that page isn't > > paged in. If we convert it to use get_user() then that's an improvement, > > but we must not run get_user() under spinlock or local_irq_disable(). I rewrote sys_tas() routine by using "lock -> unlock" instructions, and utilizing the m32r's interrupt handling characteristics; the m32r processor can accept interrupts only at the 32-bit instruction boundary. So, the "unlock" instruction can be executed continuously after the "lock" instruction execution without any interruptions. In addition, to solve such a page_fault problem, I use a fixup code like get_user(). And, as for the kernel lockup problem, we found that a calling do_page_fault() routine with disabling interrupts might cause a lockup at flush_tlb_others(), because we checked a completion of IPI handler's operations in a spin-locked critical section. Therefore, by using "lock -> unlock" code, we can implement the sys_tas() rouitine without disabling interrupts explicitly, then no lockups would happen at flush_tlb_others(), I hope. Compile check and some working test in SMP environment have done. Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b04ec261bd64f927bf3fce5cf9eeb0225557939d tree 2ad7a66b6f0dc6e0e641bef088865c5c140d0ae1 parent 49d9c81a699b57a5b6488f3a761669d05e116588 author Hirokazu Takata Mon, 20 Feb 2006 18:28:15 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:12 -0800 [PATCH] m32r: __cmpxchg_u32 fix This patch fixes a bug of include/asm-m32r/system.h:__cmpxchg_u32(). static __inline__ unsigned long __cmpxchg_u32(volatile unsigned int *p, unsigned int old, unsigned int new); In __cmpxchg_u32(), the "old" value must not be changed to the previous "*p" value. But the former code modifies the previous "*p" value. A deadlock at _atomic_dec_and_lock sometimes happened due to this bug. Signed-off-by: Hayato Fujiwara Signed-off-by: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49d9c81a699b57a5b6488f3a761669d05e116588 tree a26af993889b1fe6af95fcff7d911740b008db6c parent aa88861fc3184a7d830954661dd281de4ae8d2ba author Heiko Carstens Mon, 20 Feb 2006 18:28:14 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:12 -0800 [PATCH] s390: revert dasd eer module Revert dasd eer module until we have a common understanding of how the interface should be. Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa88861fc3184a7d830954661dd281de4ae8d2ba tree ac1ff810dd3b8426c727aba3ea57bb6381978f7d parent 15c73691780252a5571bfa7902b4dc227ec66c84 author Peter Oberparleiter Mon, 20 Feb 2006 18:28:13 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:12 -0800 [PATCH] s390: dasd reference counting When using the dasd diag discipline, the base discipline module (eckd or fba) can be unloaded, even though the dasd driver requires both discipline modules (base and diag) to work correctly. Implement reference counting for both base and diag discipline modules in order to fix this. Signed-off-by: Peter Oberparleiter Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15c73691780252a5571bfa7902b4dc227ec66c84 tree 2a2829292ca09b1774c3941ef8fdb2f5cf0f39c6 parent a1909e631caa3a02c25e493ac4004cd67984e0e0 author Frank Pavlic Mon, 20 Feb 2006 18:28:12 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:12 -0800 [PATCH] s390: V=V qdio fixes Using FCP devices with V=V support, the input queue stalled when CCQ 97 had been returned in qdio_do_eqbs. When this happen we have to reissue the eqbs instruction. Another bug was when V=V was enabled we checked if hardware has SIGA-sync support. If not we returned with 0 from tiqdio_is_inbound_q_done. Thus qdio lost initiative on FCP devices and input queue stalled. Running devices in V=V there is no SIGA-sync support but nevertheless we have to process tiqdio_is_inbound_q_done either. Signed-off-by: Frank Pavlic Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1909e631caa3a02c25e493ac4004cd67984e0e0 tree ff8f4a40cf80f5ed9e24137985959301f6ac2dab parent ec33b5fe1a6f68c0a494aab476b9667945e029c4 author Carl-Daniel Hailfinger Mon, 20 Feb 2006 18:28:11 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] radeonfb: resume support for Samsung P35 laptops Make resume from suspend-to-ram possible for Samsung P35 laptops. The radeon mobility 9700 chip on Samsung P35 laptops locks up everything on resume from suspend-to-ram if it is not reinitialized. VGA compatible controller: ATI Technologies Inc RV350 [Mobility Radeon 9600 M10] Class 0300: 1002:4e50 Subsystem: 144d:c00c Unfortunately, the DMI strings are mostly identical for all Samsung laptops. So we match the PCI ID and subsystem ID of the graphics card which is unique for each Samsung laptop model. Signed-off-by: Carl-Daniel Hailfinger Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec33b5fe1a6f68c0a494aab476b9667945e029c4 tree d3de877dabfbb378665d3d6541eacedf33e3b93d parent fcab6f351305029fc5e3c632209d45cae57e4835 author Alexey Dobriyan Mon, 20 Feb 2006 18:28:10 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] drivers/fc4/fc.c: memset correct length Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fcab6f351305029fc5e3c632209d45cae57e4835 tree 21a84b35d172b63a47421190af83eb12c006a8e2 parent 1dd31b6c89611ee91c0ff309c8733c0af61579e8 author Alexey Dobriyan Mon, 20 Feb 2006 18:28:10 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] mm/mempolicy.c: fix 'if ();' typo [akpm; it happens that the code was still correct, only inefficient ] Signed-off-by: Alexey Dobriyan Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1dd31b6c89611ee91c0ff309c8733c0af61579e8 tree 5d936be4f0856c80cf7a98dba309653a0dfbd744 parent 7fd105e758c8d746d57ab7e77f100e096bf153c8 author Zhu Yi Mon, 20 Feb 2006 18:28:09 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] ipw2200: Suppress warning message The following message will be only printed if DEBUG_NOTIF is on. "Unknown notification: subtype=40,flags=0xa0,size=40" Signed-off-by: Zhu Yi Cc: James Ketrenos Cc: Jeff Garzik Cc: "John W. Linville" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7fd105e758c8d746d57ab7e77f100e096bf153c8 tree a0d531bf9fba9e2937ad9ffe47e6fc3b8d8ec79a parent 7a9166e3b037296366cea6f3c97f705d33e209e6 author Stephen Rothwell Mon, 20 Feb 2006 18:28:08 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] Fix compile for CONFIG_SYSVIPC=n or CONFIG_SYSCTL=n The compat syscalls are added to sys_ni.c since they are not defined if the above CONFIG options are off. Also, nfs would not build with CONFIG_SYSCTL off. Noticed by Arthur Othieno. Signed-off-by: Stephen Rothwell Cc: "David S. Miller" Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a9166e3b037296366cea6f3c97f705d33e209e6 tree 275c713bc92309b6f90e5c66699753c0268c6be5 parent c8b8b1f2e0eeb91cca22211950742b5f51564672 author Luke Yang Mon, 20 Feb 2006 18:28:07 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] Fix undefined symbols for nommu architecture Signed-off-by: Luke Yang Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c8b8b1f2e0eeb91cca22211950742b5f51564672 tree 430672466bd000cae001752275e3535346789d6a parent e1c92117558261d5504c59712751f6c7925ff3ba author Benjamin Herrenschmidt Mon, 20 Feb 2006 18:28:06 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] powermac: Fix loss of ethernet PHY on sleep Some recent PowerBook models tend to lose the ethernet PHY on suspend/resume. It -seems- that they use a combo ethernet-firewire PHY chip and the firewire PHY seems to die the same way when that happens. Not trying to toggle the firewire cable power appears to fix it. So this patch disables changes to the firewire cable power control GPIO on those models. Signed-off-by: Benjamin Herrenschmidt Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1c92117558261d5504c59712751f6c7925ff3ba tree 782fccd28ad4c1037580a1b0f322cfb7fafeeb4e parent 9db91546570ca1b3bc90b4c2d25d5bb74a44be24 author Eric Van Hensbergen Mon, 20 Feb 2006 18:28:05 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] v9fs: update documentation and fix debug flag Minor updates to the documentation to bring them into sync with current websites and available features. The debug flag was switched back to hex to match the documentation. Signed-off-by: Eric Van Hensbergen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9db91546570ca1b3bc90b4c2d25d5bb74a44be24 tree 9163ca7b347399d541ab4b543bf7097dc1e9f8ab parent ab863ec342cf148d02ed180b8ecf3a71a024e4be author Peter Osterlund Mon, 20 Feb 2006 18:28:04 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:11 -0800 [PATCH] pktcdvd: Only return -EROFS when appropriate When attempting to open the device for writing, only return -EROFS if the disc appears to be readable but not writable. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab863ec342cf148d02ed180b8ecf3a71a024e4be tree e13f614947329b305c32f9dddb99bda164440e70 parent 3b4828047d4ebe3703dedbfc739958c319ff0b24 author Peter Osterlund Mon, 20 Feb 2006 18:28:04 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] pktcdvd: Fix the logic in the pkt_writable_track function Fix the pkt_writable_track() function to make it work correctly for all types of CD/DVD discs. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b4828047d4ebe3703dedbfc739958c319ff0b24 tree 845301240690c223591f5658551014729b58c3ab parent 7c613d593370292d1685f5794c743a2323be3a09 author Peter Osterlund Mon, 20 Feb 2006 18:28:03 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] pktcdvd: Remove useless printk statements Writing the detected disc type in the kernel log is not useful during normal use of the driver, so remove the printk statements. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c613d593370292d1685f5794c743a2323be3a09 tree f15deb96433b1684ef1f00ec292fffd05e730e56 parent cef289633a9321cd99dd5f6cc935657dc487e9f0 author Peter Osterlund Mon, 20 Feb 2006 18:28:02 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] pktcdvd: Rename functions and make their return values sane Boolean functions should return non-zero when they mean "true", otherwise the calling code looks weird. (As suggested by Linus.) Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cef289633a9321cd99dd5f6cc935657dc487e9f0 tree 2cbe0a2c177817d666c2b626a7627f14b6c9595e parent aa657ca9245a06fa435e00332a13da1fce182abc author Peter Osterlund Mon, 20 Feb 2006 18:28:01 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] pktcdvd: Correctly set rq->cmd_len in pkt_generic_packet() It looks like the code in pkt_generic_packet() worked by luck in the past, but after commit 186d330e682210100c671355580a8592e4a21692 leaving rq->cmd_len uninitialized doesn't work any more. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa657ca9245a06fa435e00332a13da1fce182abc tree 51e89251d12cd496cb502920467b8fa9a47b47b0 parent a9c930bac163c5e616ca0ba9378e7dc746c93227 author Juergen Kreileder Mon, 20 Feb 2006 18:28:00 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] Fix snd-usb-audio in 32-bit compat environment I'm getting oopses with snd-usb-audio in 32-bit compat environments: control_compat.c:get_ctl_type() doesn't initialize 'info', so 'itemlist[uinfo->value.enumerated.item]' in usbmixer.c:mixer_ctl_selector_info() might access random memory (The 'if ((int)uinfo->value.enumerated.item >= cval->max)' doesn't fix all problems because of the unsigned -> signed conversion.) Signed-off-by: Juergen Kreileder Cc: Jaroslav Kysela Acked-by: Takashi Iwai Cc: Greg KH Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9c930bac163c5e616ca0ba9378e7dc746c93227 tree 58ff339858cee3a87893c094561eb72381044a08 parent c255d844dd73616f23e4b4733edcc2e5fa4042b2 author Andi Kleen Mon, 20 Feb 2006 18:27:59 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] Fix units in mbind check maxnode is a bit index and can't be directly compared against a byte length like PAGE_SIZE Signed-off-by: Andi Kleen Cc: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c255d844dd73616f23e4b4733edcc2e5fa4042b2 tree 33665c47a67c3e168095e13329e71c6b5d18fd4d parent 6303dbf570e410067380daec670fdb4137ac0d1d author Pavel Machek Mon, 20 Feb 2006 18:27:58 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] suspend-to-ram: allow video options to be set at runtime Currently, acpi video options can only be set on kernel command line. That's little inflexible; I'd like userland s2ram application that just works, and modifying kernel command line according to whitelist is not fun. It is better to just allow s2ram application to set video options just before suspend (according to the whitelist). This implements sysctl to allow setting suspend video options without reboot. (akpm: Documentation updates for this new sysctl are pending..) Signed-off-by: Pavel Machek Cc: "Brown, Len" Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6303dbf570e410067380daec670fdb4137ac0d1d tree 19ae622f55fb1717a09617d1de8f0672e47ee6c1 parent 2e2b42636614f3c152672b5da67947ccbcbe0d32 author Heiko Carstens Mon, 20 Feb 2006 18:27:58 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] cpu hotplug documentation fix Looks like there was a merge conflict when patches 8f8b1138fc9f65e3591aac83a4ee394fef34ac1d and 255acee706b333b79f593dd366f16e1f107cccc3 were applied which wasn't properly resolved. Fix this and add some additional description. Signed-off-by: Heiko Carstens Cc: Ashok Raj Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e2b42636614f3c152672b5da67947ccbcbe0d32 tree d4af50e5ac2a35bdeca2b99fa4622abad15aca97 parent d2799f083dcad0413ad1a396e9bc32d9afb70535 author Andi Kleen Mon, 20 Feb 2006 18:27:57 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:10 -0800 [PATCH] x86_64: Don't set CONFIG_DEBUG_INFO in defconfig Undo setting of CONFIG_DEBUG_INFO in the previous defconfig update. It will make every build much slower and need more disk space and isn't a good default. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2799f083dcad0413ad1a396e9bc32d9afb70535 tree e3ff753888f2e03437b9ab951269d213fe522e20 parent d86d43706a27bb87c2873de369f94a10f8758063 author Stephen Street Mon, 20 Feb 2006 18:27:56 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:09 -0800 [PATCH] spi: Fix modular master driver remove and device suspend/remove Fix two problems in the spi subsystem: 1) spi subsystem core dumps when modular spi master is unloaded. 2) spi subsystem core dumps when spi slave device is suspended/resumed and module slave driver is not loaded. Signed-off-by: Stephen Street Signed-off-by: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d86d43706a27bb87c2873de369f94a10f8758063 tree 58b59f28120448b529b76cc24c5076a113e5af08 parent 7d4c8e56109e0799ab9fb644c08a8daf4a026675 author Alexey Korolev Mon, 20 Feb 2006 18:27:55 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:09 -0800 [PATCH] cfi_cmdset_0001: fix range for cache invalidation I found an issue in cfi_cmdset0001.c. It is related to cache region invalidation in the buffered write procedure. The code performs cache invalidation from "cmd_addr" to "cmd_adr + len" in do_write_buffer() while we modify region from "adr" to "adr+len". This issue affects writes + reads of data by small chunks. Signed-off-by: Nicolas Pitre Acked-by: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d4c8e56109e0799ab9fb644c08a8daf4a026675 tree 31e94080489cf7c1348dac86d0606179742555e7 parent 9b0f8b040acd8dfd23860754c0d09ff4f44e2cbc author Daniel Yeisley Mon, 20 Feb 2006 18:27:54 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:09 -0800 [PATCH] i386: need to pass virtual address to smp_read_mpc() I'm seeing a kernel panic on an ES7000-600 when booting in virtual wire mode. The panic happens because smp_read_mpc() is passed a physical address, and it should be virtual. I tested the attached patch on the ES7000-600 and on a 2 cpu Dell box, and saw no problems on either. Signed-off-by: Dan Yeisley Acked-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b0f8b040acd8dfd23860754c0d09ff4f44e2cbc tree 33c69908705c88b86f14d9e835b6dee6a9c3a31b parent 9827b781f20828e5ceb911b879f268f78fe90815 author Christoph Lameter Mon, 20 Feb 2006 18:27:52 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:09 -0800 [PATCH] Terminate process that fails on a constrained allocation Some allocations are restricted to a limited set of nodes (due to memory policies or cpuset constraints). If the page allocator is not able to find enough memory then that does not mean that overall system memory is low. In particular going postal and more or less randomly shooting at processes is not likely going to help the situation but may just lead to suicide (the whole system coming down). It is better to signal to the process that no memory exists given the constraints that the process (or the configuration of the process) has placed on the allocation behavior. The process may be killed but then the sysadmin or developer can investigate the situation. The solution is similar to what we do when running out of hugepages. This patch adds a check before we kill processes. At that point performance considerations do not matter much so we just scan the zonelist and reconstruct a list of nodes. If the list of nodes does not contain all online nodes then this is a constrained allocation and we should kill the current process. Signed-off-by: Christoph Lameter Cc: Nick Piggin Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9827b781f20828e5ceb911b879f268f78fe90815 tree 9ba223facf6071a1fd21bf8471801ab794738c05 parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Kurt Garloff Mon, 20 Feb 2006 18:27:51 -0800 committer Linus Torvalds Mon, 20 Feb 2006 20:00:09 -0800 [PATCH] OOM kill: children accounting In the badness() calculation, there's currently this piece of code: /* * Processes which fork a lot of child processes are likely * a good choice. We add the vmsize of the children if they * have an own mm. This prevents forking servers to flood the * machine with an endless amount of children */ list_for_each(tsk, &p->children) { struct task_struct *chld; chld = list_entry(tsk, struct task_struct, sibling); if (chld->mm = p->mm && chld->mm) points += chld->mm->total_vm; } The intention is clear: If some server (apache) keeps spawning new children and we run OOM, we want to kill the father rather than picking a child. This -- to some degree -- also helps a bit with getting fork bombs under control, though I'd consider this a desirable side-effect rather than a feature. There's one problem with this: No matter how many or few children there are, if just one of them misbehaves, and all others (including the father) do everything right, we still always kill the whole family. This hits in real life; whether it's javascript in konqueror resulting in kdeinit (and thus the whole KDE session) being hit or just a classical server that spawns children. Sidenote: The killer does kill all direct children as well, not only the selected father, see oom_kill_process(). The idea in attached patch is that we do want to account the memory consumption of the (direct) children to the father -- however not fully. This maintains the property that fathers with too many children will still very likely be picked, whereas a single misbehaving child has the chance to be picked by the OOM killer. In the patch I account only half (rounded up) of the children's vm_size to the parent. This means that if one child eats more mem than the rest of the family, it will be picked, otherwise it's still the father and thus the whole family that gets selected. This is heuristics -- we could debate whether accounting for a fourth would be better than for half of it. Or -- if people would consider it worth the trouble -- make it a sysctl. For now I sticked to accounting for half, which should IMHO be a significant improvement. The patch does one more thing: As users tend to be irritated by the choice of killed processes (mainly because the children are killed first, despite some of them having a very low OOM score), I added some more output: The selected (father) process will be reported first and it's oom_score printed to syslog. Description: Only account for half of children's vm size in oom score calculation This should still give the parent enough point in case of fork bombs. If any child however has more than 50% of the vm size of all children together, it'll get a higher score and be elected. This patch also makes the kernel display the oom_score. Signed-off-by: Kurt Garloff Cc: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b41c82eb5fb49912ce26c51ec221ba35e06c7d9b tree 25cfbb37391320dd3359ceeb9a4565faf0e4a47c parent cf5e40221bc509e13e22dc83c77c0c115eab531f author Dave Jones Mon, 20 Feb 2006 18:34:37 -0500 committer Dave Jones Mon, 20 Feb 2006 18:34:37 -0500 [AGPGART] Add some informational printk to nforce GART failure path. Signed-off-by: Dave Jones commit 2e242fa994428bd1a40b6a7e97430413246d0a16 tree 8ba101ac6b2f9d6e5d14eebb9091d43c9177626c parent cc1887f3d8ae8ea61efa1a75af8ec0467b9dd546 author Tejun Heo Mon, 20 Feb 2006 23:48:38 +0900 committer Jeff Garzik Mon, 20 Feb 2006 16:48:18 -0500 [PATCH] libata: make ata_sg_setup_one() trim zero length sg This patch makes ata_sg_setup_one() trim sg entry (thus making qc->n_elem zero) if padding results in zero length sg entry. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit cc1887f3d8ae8ea61efa1a75af8ec0467b9dd546 tree 3d02d3dfef8803fe9130ebac2172b6271b907109 parent 9ae61c6cb69f5251d160576c324948805f97e901 author Tejun Heo Mon, 20 Feb 2006 23:48:38 +0900 committer Jeff Garzik Mon, 20 Feb 2006 16:48:18 -0500 [PATCH] libata: fix qc->n_elem == 0 case handling in ata_qc_next_sg This patch makes ata_for_each_sg() start with pad_sgent when qc->n_elem is zero. Previously, ata_for_each_sg() unconditionally started with qc->__sg, handling the first sg to fill_sg() routines even when the entry was invalid. And while at it, unwind ?: in ata_qc_next_sg() into if statement. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 9ae61c6cb69f5251d160576c324948805f97e901 tree 14ab65b577a916c777823468889fc593d6838b12 parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Tejun Heo Mon, 20 Feb 2006 23:48:37 +0900 committer Jeff Garzik Mon, 20 Feb 2006 16:48:17 -0500 [PATCH] libata: fix WARN_ON() condition in *_fill_sg() For ATAPI commands, padding can reduce qc->n_elem by one and thus to zero making assert(qc->n_elem > 0)'s in ata_fill_sg() and qs_fill_sg() fail for legal commands. This patch fixes the assert()'s to take qc->pad_len into account. Although the condition check seems a bit excessive, as this part of code isn't still stable yet, I think it's worth to keep those. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit a8372f035aa2f6717123eb30679a08b619321dd4 tree 8f4980a847ba961513340ac4200a1a918773c0a9 parent 8e249f088131cde5f77fd073bf0b0e8b3e9ea4ac author YOSHIFUJI Hideaki Sun, 19 Feb 2006 22:32:06 -0800 committer David S. Miller Sun, 19 Feb 2006 22:32:06 -0800 [NET]: NETFILTER: remove duplicated lines and fix order in skb_clone(). Some of netfilter-related members are initalized / copied twice in skb_clone(). Remove one. Pointed out by Olivier MATZ . And this patch also fixes order of copying / clearing members. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 8e249f088131cde5f77fd073bf0b0e8b3e9ea4ac tree e0113097593dd2b805310bf525b0d2a6823f0a06 parent 669d32a293a348e692c365ddac2b23f3b907fcf1 author Patrick McHardy Sun, 19 Feb 2006 22:29:47 -0800 committer David S. Miller Sun, 19 Feb 2006 22:29:47 -0800 [NETFILTER]: Fix outgoing redirects to loopback When redirecting an outgoing packet to loopback, it keeps the original conntrack reference and information from the outgoing path, which falsely triggers the check for DNAT on input and the dst_entry is released to trigger rerouting. ip_route_input refuses to route the packet because it has a local source address and it is dropped. Look at the packet itself to dermine if it was NATed. Also fix a missing inversion that causes unneccesary xfrm lookups. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 669d32a293a348e692c365ddac2b23f3b907fcf1 tree 3ff874623fd3200bf4dc2ca23b39e589a1b6fbf1 parent bc6e14b6f0b06fe93d809d22e257ddd275feeda9 author Jean Tourrilhes Sun, 19 Feb 2006 22:28:25 -0800 committer David S. Miller Sun, 19 Feb 2006 22:28:25 -0800 [IRDA]: irda-usb bug fixes This patch fixes 2 bugs in the USB-IrDA code. The first one is a buffer overrun in the RX path. We are now using IRDA_SKB_MAX_MTU when initializing the Rx URB. The second one is a potential stack recursion when unplugging the USB dongle. It seems that first we get the Rx URB with a generic error code, and after a while the Rx URB comes again with a "disconnect" error code. Since we are resubmitting the Rx URB immediately after receiving the first error one, we might enter an endless loop. When getting an error Rx URB, the patch defers the Rx URB resubmitting so that it gives us a chance to catch the disconnect one, in case the dongle has juts been unplugged. Tested against 2.6.16-rc2. Patch from Jean Tourrilhes Signed-off-by: Jean Tourrilhes Signed-off-by: Samuel Ortiz Signed-off-by: David S. Miller commit bc6e14b6f0b06fe93d809d22e257ddd275feeda9 tree ca4ef0d384a904c6fd5a4f995a500034a4733fce parent 995110143880fd9cb255fa5df05f8950c56fb43a author Patrick McHardy Sun, 19 Feb 2006 22:26:40 -0800 committer David S. Miller Sun, 19 Feb 2006 22:26:40 -0800 [NETFILTER]: Fix NAT PMTUD problems ICMP errors are only SNATed when their source matches the source of the connection they are related to, otherwise the source address is not changed. This creates problems with ICMP frag. required messages originating from a router behind the NAT, if private IPs are used the packet has a good change of getting dropped on the path to its destination. Always NAT ICMP errors similar to the original connection. Based on report by Al Viro. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 995110143880fd9cb255fa5df05f8950c56fb43a tree 06666d72e4a4e06c646cb0ca683ee9ce0f286c82 parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Patrick McHardy Sun, 19 Feb 2006 22:11:50 -0800 committer David S. Miller Sun, 19 Feb 2006 22:11:50 -0800 [XFRM]: Fix policy double put The policy is put once immediately and once at the error label, which results in the following Oops: kernel BUG at net/xfrm/xfrm_policy.c:250! invalid opcode: 0000 [#2] PREEMPT [...] CPU: 0 EIP: 0060:[] Not tainted VLI EFLAGS: 00210246 (2.6.16-rc3 #39) EIP is at __xfrm_policy_destroy+0xf/0x46 eax: d49f2000 ebx: d49f2000 ecx: f74bd880 edx: f74bd280 esi: d49f2000 edi: 00000001 ebp: cd506dcc esp: cd506dc8 ds: 007b es: 007b ss: 0068 Process ssh (pid: 31970, threadinfo=cd506000 task=cfb04a70) Stack: <0>cd506000 cd506e34 c028e92b ebde7280 cd506e58 cd506ec0 f74bd280 00000000 00000214 0000000a 0000000a 00000000 00000002 f7ae6000 00000000 cd506e58 cd506e14 c0299e36 f74bd280 e873fe00 c02943fd cd506ec0 ebde7280 f271f440 Call Trace: [] show_stack_log_lvl+0xaa/0xb5 [] show_registers+0x126/0x18c [] die+0x14e/0x1db [] do_trap+0x7c/0x96 [] do_invalid_op+0x89/0x93 [] error_code+0x4f/0x54 [] xfrm_lookup+0x349/0x3c2 [] ip6_datagram_connect+0x317/0x452 [] inet_dgram_connect+0x49/0x54 [] sys_connect+0x51/0x68 [] sys_socketcall+0x6f/0x166 [] syscall_call+0x7/0xb Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 496b7a5159b8366b003bbc17f8c4e27f69b6779e tree 7108aa506b80e8af73f23d6e3b520fdb20a0b808 parent 8fca92705ef462f39e7db5a0f7100bcaae91bfd3 author Michael Ellerman Thu, 16 Feb 2006 14:13:53 +1100 committer Paul Mackerras Mon, 20 Feb 2006 12:03:37 +1100 [PATCH] powerpc: Fix bug in spinup of renumbered secondary threads If the logical and physical cpu ids of a secondary thread don't match, we will fail to spin the thread up on pSeries machines due to a bug in pseries/smp.c We call the RTAS "start-cpu" method with the physical cpu id, the address of pSeries_secondary_smp_init and the value to pass that function in r3. Currently we pass "lcpu", the logical cpu id, but pSeries_secondary_smp_init expects the physical cpu id in r3. We should be passing pcpu instead. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 8fca92705ef462f39e7db5a0f7100bcaae91bfd3 tree e9b4db50bb523b869616bcb5dcea763b34069f42 parent f018b36f3e1f21318066de8d01740d30e38b03d5 author Michael Ellerman Thu, 16 Feb 2006 14:13:51 +1100 committer Paul Mackerras Mon, 20 Feb 2006 12:03:36 +1100 [PATCH] powerpc: Make UP -> SMP kexec work again For UP to SMP kexec to work we need to jump into pSeries_secondary_smp_init event on a UP + KEXEC kernel. The secondary cpus will not find their hw_cpu_id in the paca and so they'll jump into kexec_wait, ready for a kexec. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit f018b36f3e1f21318066de8d01740d30e38b03d5 tree a893342f794d08a2ee79cbe960b312c54cb47e44 parent 2b9a32edba3af9ad4ccb23574bea0cc34455dc43 author Michael Ellerman Thu, 16 Feb 2006 14:13:50 +1100 committer Paul Mackerras Mon, 20 Feb 2006 12:03:34 +1100 [PATCH] powerpc: Don't start secondary CPUs in a UP && KEXEC kernel Because smp_release_cpus() is built for SMP || KEXEC, it's not safe to unconditionally call it from setup_system(). On a UP && KEXEC kernel we'll start up the secondary CPUs which will then go beserk and we die. Simple fix is to conditionally call smp_release_cpus() in setup_system(). With that in place we don't need the dummy definition of smp_release_cpus() because all call sites are #ifdef'ed either SMP or KEXEC. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit 2b9a32edba3af9ad4ccb23574bea0cc34455dc43 tree dafc13a20cd4f4c280a3e66411189b0b37f9996c parent 0728a2f99ef6efd1984f9e0ed59834c1cc602e6f author Olof Johansson Wed, 15 Feb 2006 21:40:44 -0600 committer Paul Mackerras Mon, 20 Feb 2006 10:44:34 +1100 [PATCH] powerpc: Fix OOPS in lparcfg on G5 Fallback gracefully when reading /proc/ppc64/lparcfg when the /rtas device node can't be found. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 0728a2f99ef6efd1984f9e0ed59834c1cc602e6f tree 5ea69ff5f0b51a36347bcd84f0b7bf13491cbe2a parent 092b8f3488a3e50a4ab5f2f3f7c8bbf56b3144e1 author Olaf Hering Sat, 11 Feb 2006 18:21:47 +0100 committer Paul Mackerras Mon, 20 Feb 2006 10:44:31 +1100 [PATCH] powerpc: remove duplicate exports A few symbols are exported twice, remove them from ppc_ksyms.c Remove users of sys_ctrler in arch/ppc/ WARNING: vmlinux: duplicate symbol '__delay' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol '__up' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol '__down' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol '__down_interruptible' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'sys_ctrler' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strncat' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strncmp' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strchr' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strrchr' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strnlen' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strpbrk' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'memscan' previous definition was in vmlinux WARNING: vmlinux: duplicate symbol 'strstr' previous definition was in vmlinux Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 092b8f3488a3e50a4ab5f2f3f7c8bbf56b3144e1 tree fe9aa2dc2de1ed23109ef77ce8bd38120c2d643d parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Paul Mackerras Mon, 20 Feb 2006 10:38:56 +1100 committer Paul Mackerras Mon, 20 Feb 2006 10:38:56 +1100 powerpc: Keep xtime and gettimeofday in sync This fixes a regression which was introduced by moving ppc32 to use the same sort of lockless gettimeofday as ppc64 has been using for some time. This involves getting the timebase and performing some simple arithmetic to convert it to seconds and microseconds. However, the factor and offset used there weren't being updated when NTP varied the tick length using adjtimex. 64-bit didn't notice the problem because it had a hook in the 32-bit adjtimex compat routine that attempted to work out what the generic timekeeping code would do and alter the factor and offset to match. However, that code was very complex and it wasn't clear that it still matched what the generic code would do. Now we use the generic current_tick_length() routine that was recently added to check that the current tick will be as long as we expect; if not we recompute the factor and offset. This keeps gettimeofday and xtime in sync. In addition we check that gettimeofday hasn't got ahead of xtime on each timer interrupt; if it has, we resync. Signed-off-by: Paul Mackerras commit ad6b97fc929e5844bfd1d708ab1d74d131d7960d tree a612bab865a960c88dbff2f0f19ed22be779fa81 parent cead14da59fc261534fa749886c12c16757711fd author Al Viro Fri, 03 Feb 2006 02:06:42 -0500 committer Al Viro Sat, 18 Feb 2006 16:30:40 -0500 [PATCH] iomap_copy fallout (m68k) added __raw_writel(), sanitized include order in iomap_copy.c Signed-off-by: Al Viro commit cead14da59fc261534fa749886c12c16757711fd tree 32ee8b229e443d2edf70be1f3ab398cafb5b13ff parent cc6cdac0cf11955dc81d6c50b6738d05e1dca12b author Al Viro Wed, 18 Jan 2006 19:41:35 -0500 committer Al Viro Sat, 18 Feb 2006 16:30:20 -0500 [PATCH] m68k: pm_power_off() breakage Signed-off-by: Al Viro commit cc6cdac0cf11955dc81d6c50b6738d05e1dca12b tree 7d5d033ea4f59605ae0d8c21e1284af999ba6fb2 parent 00fc00df9e7b637cd13fe1f163da0a2957273947 author Al Viro Sat, 18 Feb 2006 16:02:18 -0500 committer Al Viro Sat, 18 Feb 2006 16:02:18 -0500 [PATCH] missing ntohs() in ip6_tunnel ->payload_len is net-endian Signed-off-by: Al Viro commit 00fc00df9e7b637cd13fe1f163da0a2957273947 tree 9968c24785369e37a9eaa4bd9852b4c3b10f9130 parent 76b6159ba094544e003a237cedcf555d82fa3bfe author Al Viro Wed, 18 Jan 2006 21:22:55 -0500 committer Al Viro Sat, 18 Feb 2006 15:59:06 -0500 [PATCH] m68k: restore disable_irq_nosync() Patch claiming to remove enable_irq_nosync() had left it alive but killed disable_irq_nosync() instead... Signed-off-by: Al Viro commit 76b6159ba094544e003a237cedcf555d82fa3bfe tree 134d104a2e1568d752a8d509cdeba86815f8f66d parent e30809fde59d591809f00caa1a4c960cca5916af author Al Viro Wed, 08 Feb 2006 14:37:40 -0500 committer Al Viro Sat, 18 Feb 2006 15:54:36 -0500 [PATCH] fix handling of st_nlink on procfs root 1) it should use nr_processes(), not nr_threads; otherwise we are getting very confused find(1) and friends, among other things. 2) better do that at stat() time than at every damn lookup in procfs root. Patch had been sitting in FC4 kernels for many months now... Signed-off-by: Al Viro commit e30809fde59d591809f00caa1a4c960cca5916af tree 370d85a6158e45db26edf233404ac70d290c618b parent ef20c8c197df9b8d5bd4af0679123826da028861 author Al Viro Wed, 08 Feb 2006 14:09:00 -0500 committer Al Viro Sat, 18 Feb 2006 15:54:13 -0500 [PATCH] don't mangle INQUIRY if cmddt or evpd bits are set sbp2.c mangles INQUIRY response in a way that only applies to standard inquiry data (i.e. when both cmddt and evpd bits are 0). Leave other cases alone; e.g. when asking for VPD the length of reply is in byte 3, not 4 and byte 4 is the first byte of device serial number. Signed-off-by: Al Viro commit ef20c8c197df9b8d5bd4af0679123826da028861 tree 764632d00ca11f241013b1e203d1b9a5c9e30acb parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Al Viro Sat, 18 Feb 2006 15:41:50 -0500 committer Al Viro Sat, 18 Feb 2006 15:41:50 -0500 [PATCH] GFP_KERNEL allocations in atomic (auditsc) audit_log_exit() is called from atomic contexts and gets explicit gfp_mask argument; it should use it for all allocations rather than doing some with gfp_mask and some with GFP_KERNEL. Signed-off-by: Al Viro commit 73d72cffe53407e447df0cbb0bf15a2c931108b3 tree c6f282d3a45068df28d3891e28303eac8452ff86 parent 4e5e2e2560aa1d1d01f7af97af2f72706f61da27 author Dave Airlie Sat, 18 Feb 2006 16:30:54 +1100 committer Dave Airlie Sat, 18 Feb 2006 16:30:54 +1100 drm: fix brace placement Signed-off-by: Dave Airlie commit 4e5e2e2560aa1d1d01f7af97af2f72706f61da27 tree 80a02e0cc1871cc1f528e8fbf8544130c7790635 parent 91e3738ebc6d858e784090382e02afeae5a93b08 author Dave Airlie Sat, 18 Feb 2006 15:51:35 +1100 committer Dave Airlie Sat, 18 Feb 2006 15:51:35 +1100 drm: radeon add r300 TX_CNTL and verify bitblt packets The Xgl on r300 doesn't work unless you add a verify bitblt function to the DRM, and we need to pass TX_CNTL to flush texture caches. Signed-off-by: Dave Airlie commit 91e3738ebc6d858e784090382e02afeae5a93b08 tree 985021be6624126bcbebd8e038a324668703736b parent bd71c2b17468a2531fb4c81ec1d73520845e97e1 author Dave Airlie Sat, 18 Feb 2006 15:17:04 +1100 committer Dave Airlie Sat, 18 Feb 2006 15:17:04 +1100 drm: fixup i915 interrupt on X server exit Fixes: IRQ disabled (i915?) when switchig between gnome themes (gnome-theme-manager) Signed-off-by: Dave Airlie commit cf5e40221bc509e13e22dc83c77c0c115eab531f tree 1203ab413a83f8ae13e4a97273d653b2de3bd106 parent 1311c24fad3b2acad5c6545d2107c226774f02e8 author Dave Jones Sun, 12 Feb 2006 21:05:32 -0500 committer Dave Jones Sun, 12 Feb 2006 21:05:32 -0500 [AGPGART] Improve the error message shown when we detect a ServerWorks CNB20HE This chipset is unsupported, and likely to remain that way. Signed-off-by: Dave Jones commit 1311c24fad3b2acad5c6545d2107c226774f02e8 tree 8aabb61237dba6c432d6876586c17c5b818d8005 parent 3b0e8eadc511eaceba6d6b8d0743359a34ee23c6 author Adrian Bunk Fri, 10 Feb 2006 11:56:30 +0100 committer Dave Jones Fri, 10 Feb 2006 14:41:00 -0500 [AGPGART] help text updates This patch contains help text updates including the following: - XFree86 * -> X - there is no need for repeating part of the help text of the AGP option and having "If unsure, say Y/N." in the chip specific options. Signed-off-by: Adrian Bunk Signed-off-by: Dave Jones