commit a1c582d0720f2eff61043e90711767decf37b917 Merge: b5f281a... fc43dca... Author: Linus Torvalds Date: Thu Aug 30 09:58:46 2007 -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] PS3: Fix bug where the major version part is not compared [POWERPC] Update defconfigs [POWERPC] spufs: Don't call spu_run_init from spu_reacquire_runnable [POWERPC] spufs: Fix update of mailbox status register during backed wbox write [POWERPC] spu_manage: fix spu_unit_number for celleb device tree [POWERPC] Update defconfigs [POWERPC] Flush registers to proper task context commit b5f281a62761887e7cb5f60fa81f7cd052fec5cb Author: Adrian Bunk Date: Thu Aug 30 01:29:33 2007 +0200 xtensa process.c must #include Another fallout from the removal of #include from mm.h Signed-off-by: Adrian Bunk Signed-off-by: Linus Torvalds commit 8057d763ed7a7365dc3402db0aed7c87d8531ecb Author: Rusty Russell Date: Thu Aug 30 06:35:08 2007 +1000 Fix lguest page-pinning logic ("lguest: bad stack page 0xc057a000") If the stack pointer is 0xc057a000, then the first stack page is at 0xc0579000 (the stack pointer is decremented before use). Not calculating this correctly caused guests with CONFIG_DEBUG_PAGEALLOC=y to be killed with a "bad stack page" message: the initial kernel stack was just proceeding the .smp_locks section which CONFIG_DEBUG_PAGEALLOC marks read-only when freeing. Thanks to Frederik Deweerdt for the bug report! Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit fc43dca9e75b87d24a16d5be7b497e83837d9d31 Author: Masakazu Mokuno Date: Wed Aug 29 20:30:25 2007 +0900 [POWERPC] PS3: Fix bug where the major version part is not compared Fix the bug that the major version part of the firmware version number is ignored in the comparison done by ps3_compare_firmware_version because the difference of two 64-bit quantities is returned as an int. Signed-off-by: Masakazu Mokuno Acked-by: Geoff Levand Signed-off-by: Paul Mackerras commit 13a6976afdb10d54ac5ad344aa0c588bc0bd8b0a Author: Paul Mackerras Date: Thu Aug 30 16:51:51 2007 +1000 [POWERPC] Update defconfigs Signed-off-by: Paul Mackerras commit ada83daab31c3ec35845785482124373a62f430c Author: Andre Detsch Date: Tue Aug 21 10:06:22 2007 +0800 [POWERPC] spufs: Don't call spu_run_init from spu_reacquire_runnable This fixes a major bug which was happening when a SPU thread advances its execution right after being restored to a SPU. A potentially outdated NPC value was being (re)written to the SPU. So, spu_run_init, in this case, was either not doing anything relevant, or breaking the execution of the SPU thread. This fixes a common problem of losing a mailbox write when it was done to a saved context. Signed-off-by: Andre Detsch Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit 62ee68e3bcb0d056aae5b36dea0388ca25572cdf Author: Arnd Bergmann Date: Tue Aug 21 10:06:22 2007 +0800 [POWERPC] spufs: Fix update of mailbox status register during backed wbox write When a process writes into the inbound spu mailbox (wbox) while the context is saved, we accidentally break the contents of the mb_stat_R register by clearing other entries of the mailbox status register. This can cause the user side to hang. This change fixes the problem by only altering the appropriate bits of the mailbox status register during a backing-store write. Signed-off-by: Arnd Bergmann Signed-off-by: Jeremy Kerr Signed-off-by: Paul Mackerras commit aac2e68481681a362ab6f44fc515034e2a4c7f2c Author: Christian Krafft Date: Thu Aug 30 01:33:53 2007 +0200 [POWERPC] spu_manage: fix spu_unit_number for celleb device tree This fixes a regression introduced with 2.6.23-rc4 after on some confusion about the device tree interfaces. IBM QS21 device trees provide "physical-id", so we changed the code to run on that and remain compatible with all IBM machines. However, the Toshiba Celleb device tree provides the "unit-id" property, which was in the Linux code, but never used in this way on IBM hardware. Legacy device tree used the reg property for the physical id of an spe. This patch fixes find_spu_unit_number to look for the spu id in that order. The length is checked to avoid misinterpretation in case the attributes unit-id or reg do not contain the id. Signed-off-by: Christian Krafft Signed-off-by: Arnd Bergmann Cc: Jeremy Kerr commit 5cc44e086d7a4e20035997ec612678ca91f426e7 Author: Kumar Gala Date: Tue Aug 28 21:46:53 2007 -0500 [POWERPC] Update defconfigs Signed-off-by: Kumar Gala commit 0ee6c15e7ba7b36a217cdadb292eeaf32a057a59 Author: Kumar Gala Date: Tue Aug 28 21:15:53 2007 -0500 [POWERPC] Flush registers to proper task context When we flush register state for FP, Altivec, or SPE in flush_*_to_thread we need to respect the task_struct that the caller has passed to us. Most cases we are called with current, however sometimes (ptrace) we may be passed a different task_struct. This showed up when using gdbserver debugging a simple program that used floating point. When gdb tried to show the FP regs they all showed up as 0, because the child's FP registers were never properly flushed to memory. Signed-off-by: Kumar Gala