commit d3a47e82b6bc3724dd60f3ee4e84fe4479104382 Merge: 99c3563... c459ce8... Author: Linus Torvalds Date: Tue Sep 30 09:47:16 2008 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Put the space for cpu0 per-cpu area into .data section commit 99c3563e64cf887cca0b181149c0f85c39569276 Merge: 022d5bc... 24918b6... Author: Linus Torvalds Date: Tue Sep 30 09:38:42 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Fix model for Dell Inspiron 1525 ALSA: ASoC: Fix cs4270 error path commit 022d5bcd49e0b3c3a3fde60491837414f96cc20e Merge: 95237b8... 6cac6e8... Author: Linus Torvalds Date: Tue Sep 30 08:42:21 2008 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd * 'for-linus' of git://git.o-hand.com/linux-mfd: mfd: Fix asic3 compilation mfd: Fix Kconfig accroding to the new gpiolib symbols commit 95237b80a3021ce5abb4d9ad330355549026f9c3 Merge: cf4b0b2... 61e9916... Author: Linus Torvalds Date: Tue Sep 30 08:40:46 2008 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Fix failure to shutdown with CPU hotplug powerpc: Fix PCI in Holly device tree commit cf4b0b2c9520728e170f7a3061e24dbae0b56ed4 Merge: 94aca1d... ccc7dad... Author: Linus Torvalds Date: Tue Sep 30 08:39:18 2008 -0700 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hrtimer: prevent migration of per CPU hrtimers hrtimer: mark migration state hrtimer: fix migration of CB_IRQSAFE_NO_SOFTIRQ hrtimers hrtimer: migrate pending list on cpu offline Acked-by: Paul E. McKenney Acked-by: Benjamin Herrenschmidt Tested-by: Paul E. McKenney commit 24918b61b55c21e09a3e07cd82e1b3a8154782dc Author: Takashi Iwai Date: Tue Sep 30 12:58:54 2008 +0200 ALSA: hda - Fix model for Dell Inspiron 1525 Dell Inspiron 1525 seems to have a buggy BIOS setup and screws up the recent codec parser, as reported by Oleksandr Natalenko: http://lkml.org/lkml/2008/9/12/203 This patch adds the working model, dell-3stack, statically. Signed-off-by: Takashi Iwai Cc: commit e3145dfb7b4262fa55907006b75da799de8c1be3 Author: Jean Delvare Date: Tue Sep 30 11:40:37 2008 +0200 ALSA: ASoC: Fix cs4270 error path The error path in cs4270_probe/cs4270_remove is pretty broken: * If cs4270_probe fails, codec is leaked. * If snd_soc_register_card fails, cs4270_i2c_driver stays registered. * If I2C support is enabled but no I2C device is found, i2c_del_driver is never called (neither in cs4270_probe nor in cs4270_remove. Fix all 3 problems by implementing a clean error path in cs4270_probe and jumping to its labels as needed. Signed-off-by: Jean Delvare Acked-by: Timur Tabi Signed-off-by: Takashi Iwai commit 6cac6e8489af6c419cb6af6911535a280e6b6c2e Author: Samuel Ortiz Date: Thu Sep 25 00:43:59 2008 +0200 mfd: Fix asic3 compilation map_size was declared from the wrong place. Signed-off-by: Samuel Ortiz commit 2eedd6047b050f82f4e596a50704686ec989c1c8 Author: Samuel Ortiz Date: Thu Sep 25 00:39:05 2008 +0200 mfd: Fix Kconfig accroding to the new gpiolib symbols HAVE_GPIO_LIB has basically been replaced by GPIOLIB Signed-off-by: Samuel Ortiz commit 61e9916eba35dfb76d38013a5aae9a59cc50877a Author: Johannes Berg Date: Wed Sep 24 22:56:25 2008 +0000 powerpc: Fix failure to shutdown with CPU hotplug I tracked down the shutdown regression to CPUs not dying when being shut down during power-off. This turns out to be due to the system_state being SYSTEM_POWER_OFF, which this code doesn't take as a valid state for shutting off CPUs in. This has never made sense to me, but when I added hotplug code to implement hibernate I only "made it work" and did not question the need to check the system_state. Thomas Gleixner helped me dig, but the only thing we found is that it was added with the original commit that added CPU hotplug support. Signed-off-by: Johannes Berg Acked-by: Joel Schopp Signed-off-by: Benjamin Herrenschmidt commit ad611045ce5d059af84a9855b22ca3f7a99d47be Author: David Gibson Date: Wed Sep 24 16:39:04 2008 +0000 powerpc: Fix PCI in Holly device tree The PCI bridge on the Holly board is incorrectly represented in the device tree. The current device tree node for the PCI bridge sits under the tsi-bridge node. That's not obviously wrong, but the PCI bridge translates some PCI spaces into CPU address ranges which were not translated by the "ranges" property in tsi-bridge node. We used to get away with this problem because the PCI bridge discovery code was also buggy, assuming incorrectly that PCI host bridge nodes were always directly under the root bus and treating the translated addresses as raw CPU addresses, rather than parent bus addresses. This has since been fixed, thus breaking Holly. This could be fixed by adding extra translations to the tsi-bridge node, but this patch instead moves the Holly PCI bridge out of the tsi-bridge node to the root bus. This makes the tsi-bridge node represent only the built-in IO devices in the bridge, with a more-or-less contiguous address range. This is the same convention used on Freescale SoC chips, where the "soc" node represents only the IMMR region, and the PCI and other bus bridges are separate nodes under the root bus. Signed-off-by: David Gibson Acked-by: Josh Boyer Signed-off-by: Benjamin Herrenschmidt commit c459ce8b5a7d933a3bcf6915ab17ac1e036e2ac4 Author: Tony Luck Date: Mon Sep 29 16:39:19 2008 -0700 [IA64] Put the space for cpu0 per-cpu area into .data section Initial fix for making sure that we can access percpu variables in all C code (commit: 10617bbe84628eb18ab5f723d3ba35005adde143) inadvertantly allocated the memory in the "percpu" section of the vmlinux ELF executable. This confused kexec/dump. Signed-off-by: Tony Luck commit ccc7dadf736639da86f3e0c86832c11a66fc8221 Author: Thomas Gleixner Date: Mon Sep 29 15:47:42 2008 +0200 hrtimer: prevent migration of per CPU hrtimers Impact: per CPU hrtimers can be migrated from a dead CPU The hrtimer code has no knowledge about per CPU timers, but we need to prevent the migration of such timers and warn when such a timer is active at migration time. Explicitely mark the timers as per CPU and use a more understandable mode descriptor for the interrupts safe unlocked callback mode, which is used by hrtimer_sleeper and the scheduler code. Signed-off-by: Thomas Gleixner commit b00c1a99e7758f794923c61e5cd55268d61c9469 Author: Thomas Gleixner Date: Mon Sep 29 15:44:46 2008 +0200 hrtimer: mark migration state Impact: during migration active hrtimers can be seen as inactive The migration code removes the hrtimers from the queues of the dead CPU and sets the state temporary to INACTIVE. The enqueue code sets it to ACTIVE/PENDING again. Prevent that the wrong state can be seen by using a separate migration state bit. Signed-off-by: Thomas Gleixner commit 41e1022eae71707f1ce6801a746f70b1e57b7567 Author: Thomas Gleixner Date: Mon Sep 29 14:09:39 2008 +0200 hrtimer: fix migration of CB_IRQSAFE_NO_SOFTIRQ hrtimers Impact: Stale timers after a CPU went offline. commit 37bb6cb4097e29ffee970065b74499cbf10603a3 hrtimer: unlock hrtimer_wakeup changed the hrtimer sleeper callback mode to CB_IRQSAFE_NO_SOFTIRQ due to locking problems. A result of this change is that when enqueue is called for an already expired hrtimer the callback function is not longer called directly from the enqueue code. The normal callers have been fixed in the code, but the migration code which moves hrtimers from a dead CPU to a live CPU was not made aware of this. This can be fixed by checking the timer state after the call to enqueue in the migration code. Signed-off-by: Thomas Gleixner commit 7659e349672bb0d378ef8d7d62bae4c53d2bdd18 Author: Thomas Gleixner Date: Mon Sep 29 14:06:45 2008 +0200 hrtimer: migrate pending list on cpu offline Impact: hrtimers which are on the pending list are not migrated at cpu offline and can be stale forever Add the pending list migration when CONFIG_HIGH_RES_TIMERS is enabled Signed-off-by: Thomas Gleixner