Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / kernel / cpu.c

diff --git a/kernel/cpu.c b/kernel/cpu.c
index e5d5e8e1e03048424c41cb17bff75d4e91a6f060..b5e4ab2d427e874404347c7e20186ed4cfd2f488 100644 (file)
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -256,6 +256,8 @@ static int __ref take_cpu_down(void *_param)
                return err;
 
        cpu_notify(CPU_DYING | param->mod, param->hcpu);
+       /* Park the stopper thread */
+       kthread_park(current);
        return 0;
 }