commit 2d8348b429b4ae5cc47449c787881221fe43af4b Author: Alexey Starikovskiy Date: Fri Aug 31 09:05:26 2007 +0400 ACPI: EC: Check if boot_ec was really found in DSDT acpi_get_devices() returns success if it did not find any device. We have to check for this case. Signed-off-by: Alexey Starikovskiy Tested-by: Daniel Ritz Tested-by: Luca Signed-off-by: Linus Torvalds commit e70da5634835ecd8abb68d14cfc27384d01dd201 Merge: 644b55c... 4ac212a... Author: Linus Torvalds Date: Thu Aug 30 21:55:37 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6: SELinux: clear parent death signal on SID transitions commit 644b55ce889edd37d6406df26e2d96d7a7390749 Merge: feabb06... b3e2c70... Author: Linus Torvalds Date: Thu Aug 30 21:55:22 2007 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: psmouse - make dummy touchkit_ps2_detect() static Input: gscps2 - convert to use kzalloc Input: iforce - fix 'unused variable' warning Input: i8042 - fix retrun value of i8042_aux_test_irq Input: gpio_keys - remove duplicate includes commit feabb06bd70551668540f2305047675667f5f60f Merge: 62e6f1e... a98b38b... Author: Linus Torvalds Date: Thu Aug 30 21:54:57 2007 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 4561/1: i.MX/MX1 GPIO parenthes omission and input setup fix [ARM] 4557/1: Fix PXA irq gpio initialization [ARM] 4551/1: s3c24xx: fix wrong virtual address offsets [ARM] 4552/1: i.MX/MX1 GPIO output setup fix [ARM] 4553/1: ARM at91: define FIQ_START [ARM] 4554/1: replace consistent_sync() with flush_ioremap_region() ARM: OMAP: Enable serial idling and wakeup features ARM: OMAP2: Force APLLs always active ARM: OMAP: H3 workqueue fixes ARM: OMAP: OSK led fixes ARM: OMAP: fix OMAP1 dmtimer build warning ARM: OMAP: Fix 32k timer unsupported one-shot mode commit 62e6f1e8bb7c48c02b8bdb3085c5f6365682149b Author: Hugh Dickins Date: Fri Aug 31 04:26:50 2007 +0100 fix maxcpus=1 oops in show_stat() Alexey Dobriyan reports that maxcpus=1 is still broken in 2.6.23-rc4: if CONFIG_HOTPLUG_CPU is not set, x86_64 bootup oopses in show_stat() - for_each_possible_cpu accesses a per-cpu area which was never set up. Alexey identified commit 61ec7567db103d537329b0db9a887db570431ff4 (ACPI: boot correctly with "nosmp" or "maxcpus=0") as the origin; but it's not really to blame, just exposes a bug in 2.6.23-rc1's commit 8b3b295502444340dd0701855ac422fbf32e161d (Especially when !CONFIG_HOTPLUG_CPU, avoid needlessy allocating resources for CPUs that can never become available). rc1's test for max_cpus < 2 in start_kernel() wasn't working because max_cpus was still NR_CPUS at that point: until rc4 moved the maxcpus parsing earlier. Now it sets cpu_possible_map to 1 before allocating all possible per-cpu areas; then smp_init() expands cpu_possible_map to cpu_present_map (0xf in my case) later on. rc1's commit has good intentions, but expects cpu_present_map to be limited by maxcpus, which is only the case on i386. cpus_and(possible, possible,present) might be good, but needs an audit of cpu_present_map uses - there may well be assumptions that any cpu present is possible. So stay safe for now and just revert those #ifndef CONFIG_HOTPLUG_CPU optimizations in rc1's commit. Signed-off-by: Hugh Dickins Cc: Alexey Dobriyan Cc: Len Brown Cc: Andrew Morton Cc: Jan Beulich Signed-off-by: Linus Torvalds commit 4ac212ad4e8fafc22fa147fc255ff5fa5435cf33 Author: Stephen Smalley Date: Wed Aug 29 08:51:50 2007 -0400 SELinux: clear parent death signal on SID transitions Clear parent death signal on SID transitions to prevent unauthorized signaling between SIDs. Signed-off-by: Stephen Smalley Acked-by: Eric Paris Signed-off-by: James Morris 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 a98b38b83db3d377ede6b72cebe7ed2dc4127766 Author: Pavel Pisa Date: Wed Aug 29 23:23:38 2007 +0100 [ARM] 4561/1: i.MX/MX1 GPIO parenthes omission and input setup fix During GPIO testing on PiMX1 board there has been revealed problem with some pins input functions. The GIUS bit has to be set for inputs to work reliably too. It is surprising that input worked on some inputs with incorrect setup before. DR is not mandatory, but it ensures stable constant level on internal traces. Signed-off-by: Pavel Pisa Acked-by: Sascha Hauer Signed-off-by: Russell King 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 b3e2c70cd0d05fb6621521521fbd5debed57d753 Author: Adrian Bunk Date: Thu Aug 30 00:44:33 2007 -0400 Input: psmouse - make dummy touchkit_ps2_detect() static The dummy touchkit_ps2_detect() for the CONFIG_MOUSE_PS2_TOUCHKIT=n case shouldn't be a global function. Signed-off-by: Adrian Bunk Signed-off-by: Dmitry Torokhov commit 7460caf32a16866f9d8675aa7aefd7d82d1e23f7 Author: Mariusz Kozlowski Date: Thu Aug 30 00:18:00 2007 -0400 Input: gscps2 - convert to use kzalloc Signed-off-by: Mariusz Kozlowski Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit d9f03831e7dc743ae25863c59f38884f5989ab39 Author: Andrew Morton Date: Thu Aug 30 00:04:33 2007 -0400 Input: iforce - fix 'unused variable' warning drivers/input/joystick/iforce/iforce-packets.c: In function `iforce_get_id_packet': drivers/input/joystick/iforce/iforce-packets.c:249: warning: unused variable `status' Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit e3758b2ab61b3001b9db4582559bbaeba5e24a29 Author: Fernando Luis Vázquez Cao Date: Thu Aug 30 00:04:15 2007 -0400 Input: i8042 - fix retrun value of i8042_aux_test_irq We should not return IRQ_HANDLED if we didn't handle the interrupt. Signed-off-by: Fernando Luis Vazquez Cao Signed-off-by: Dmitry Torokhov 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 commit fd51bcc5dc4073b18308f25846aa3b421fa3c42e Author: Samuel Date: Tue Aug 28 19:56:34 2007 +0100 [ARM] 4557/1: Fix PXA irq gpio initialization As pointed out by Jrgen, we are overflowing the number of GPIOs in pxa_init_irq_gpio(). I'm seeing the same problem on my HTC Universal PXA270 based PDA. According to Eric, the function argument is the number of GPIOs, so we should keep the semantics and reduce the number of iteration by 1. Signed-off-by: Samuel Ortiz Acked-by: Jrgen Schindele Signed-off-by: Russell King commit d555dd5065ab6dd4437c609950c5d9c6377b4896 Merge: 9d84588... 671c723... Author: Russell King Date: Sat Aug 25 12:38:47 2007 +0100 Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 commit 9d84588bdb72b6ec9d891fbdaa4305023e16ee3a Author: Krzysztof Helt Date: Sat Aug 18 22:23:57 2007 +0100 [ARM] 4551/1: s3c24xx: fix wrong virtual address offsets This patch reduces 36-bit offset to 32-bit offsets. The 36-bit offsets makes virtual addresses wraps when added to 32-bit base. Signed-off-by: Krzysztof Helt Acked-by: Ben Dooks Signed-off-by: Russell King commit a228d6e7ed8e3624b6c1497a550d8d0e2cac889f Author: Pavel Pisa Date: Mon Aug 20 21:39:41 2007 +0100 [ARM] 4552/1: i.MX/MX1 GPIO output setup fix The pins for GPIO should be provided as plain number build as (GPIO_PORTx + pin_number). But to setup the output GPIO_GIUS and GPIO_DR have to be specified in mode to route right value to the pin. This is a fix, it should go to 2.6.23 Signed-off-by: Pavel Pisa Acked-by: Sascha Hauer Signed-off-by: Russell King commit 7b1bc03e803f772bf71245eaba461651f32481b4 Author: Karl Olsen Date: Mon Aug 20 22:35:04 2007 +0100 [ARM] 4553/1: ARM at91: define FIQ_START For ARM at91, the FIQ_START #define is required if you use a driver that enables FIQ support. Signed-off-by: Karl Olsen Acked-by: Andrew Victor Signed-off-by: Russell King commit 90833fdab89da02fc0276224167f0a42e5176f41 Author: Jared Hulbert Date: Wed Aug 22 17:38:25 2007 +0100 [ARM] 4554/1: replace consistent_sync() with flush_ioremap_region() This fixes a regression from around 2.6.18, consistent_sync() will now BUG() under these circumstances. The use of consistent_sync() was a hack, replacing it's usage here with a new function, flush_ioremap_region(). Signed-off-by: Jared Hulbert Acked-by: Pavel Pisa Signed-off-by: Russell King commit 671c7235ccd537f828986ef5a4071bf477541dc0 Author: Juha Yrjola Date: Wed Dec 6 17:13:49 2006 -0800 ARM: OMAP: Enable serial idling and wakeup features Enable serial idling and wakeup features Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit 1abc70fcd81b920dd7a1091ba8863dfe5463b130 Author: Juha Yrjola Date: Wed Dec 6 17:13:47 2006 -0800 ARM: OMAP2: Force APLLs always active The APLLs are most efficiently idled by hardware. Signed-off-by: Juha Yrjola Signed-off-by: Tony Lindgren commit 666cd174c451c172dd115b9d94f150efe627b609 Author: Dirk Behme Date: Thu Jan 25 16:26:46 2007 -0800 ARM: OMAP: H3 workqueue fixes Signed-off-by: Dirk Behme Signed-off-by: Tony Lindgren commit eebdf7d7c478682756fd29d376223f350311f105 Author: David Brownell Date: Mon Apr 2 12:48:10 2007 -0700 ARM: OMAP: OSK led fixes Bugfixes for the OSK led support: - Fix Kconfig merge glitches: Mistral handles idle and timer leds just fine - Fix pm_suspend() runtime botch: can't sleep, so can't touch tps65010 leds Improvements: - Switch sense of Mistral idle led, so idle == off Probably the TPS65010 leds should be handled only by the "new led" API. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren commit 4e63915cbe4525beb9c0281f8e22945d88acc9bc Author: David Brownell Date: Mon Apr 2 12:45:50 2007 -0700 ARM: OMAP: fix OMAP1 dmtimer build warning Remove the OMAP1 version of omap_dm_timer_get_fclk(), and its associated compile-time warning. It would only BUG() if called, while it's only called on OMAP2. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren commit 5c5dccad31670faa716cbc9d8a6f918487f60a09 Author: Kevin Hilman Date: Wed May 16 08:52:05 2007 -0700 ARM: OMAP: Fix 32k timer unsupported one-shot mode Fix unsupported one-shot mode in set_mode hook. Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 29e8277defa1013f8f5367aec58161d3a81de8f7 Author: Jesper Juhl Date: Mon Jul 23 20:39:13 2007 -0400 Input: gpio_keys - remove duplicate includes Signed-off-by: Jesper Juhl Signed-off-by: Dmitry Torokhov