diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 15:47:51 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-03 15:47:51 -0700 |
commit | 39d112100e561686ab1e2b19c57984163ad6c1fa (patch) | |
tree | 19b3cd50345306de6f95b58b4a35e8f725786b9b /kernel/stop_machine.c | |
parent | 167b7129042a4b4c09bb4ede5482ff79340a3999 (diff) | |
parent | 02f726949f2be0967aa4871dd4e47d3967779b26 (diff) | |
download | kernel_samsung_smdk4412-39d112100e561686ab1e2b19c57984163ad6c1fa.zip kernel_samsung_smdk4412-39d112100e561686ab1e2b19c57984163ad6c1fa.tar.gz kernel_samsung_smdk4412-39d112100e561686ab1e2b19c57984163ad6c1fa.tar.bz2 |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched, trace: Fix sched_switch() prev_state argument
sched: Fix wake_affine() vs RT tasks
sched: Make sure timers have migrated before killing the migration_thread
Diffstat (limited to 'kernel/stop_machine.c')
-rw-r--r-- | kernel/stop_machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index b4e7431..70f8d90 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c @@ -321,7 +321,7 @@ static int __cpuinit cpu_stop_cpu_callback(struct notifier_block *nfb, #ifdef CONFIG_HOTPLUG_CPU case CPU_UP_CANCELED: - case CPU_DEAD: + case CPU_POST_DEAD: { struct cpu_stop_work *work; |