Merge branch 'linus' into cpus4096

Conflicts:

	kernel/stop_machine.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 5 insertions, 11 deletions

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 06a8358bb418..e202a68d1cc1 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -216,7 +216,6 @@ static int __ref take_cpu_down(void *_param)
 static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
 {
         int err, nr_calls = 0;
-        struct task_struct *p;
         cpumask_t old_allowed, tmp;
         void *hcpu = (void *)(long)cpu;
         unsigned long mod = tasks_frozen ? CPU_TASKS_FROZEN : 0;
@@ -249,21 +248,18 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
         cpus_setall(tmp);
         cpu_clear(cpu, tmp);
         set_cpus_allowed_ptr(current, &tmp);
+        tmp = cpumask_of_cpu(cpu);
 
-        p = __stop_machine_run(take_cpu_down, &tcd_param, cpu);
-
-        if (IS_ERR(p) || cpu_online(cpu)) {
+        err = __stop_machine(take_cpu_down, &tcd_param, &tmp);
+        if (err) {
                 /* CPU didn't die: tell everyone.  Can't complain. */
                 if (raw_notifier_call_chain(&cpu_chain, CPU_DOWN_FAILED | mod,
                                             hcpu) == NOTIFY_BAD)
                         BUG();
 
-                if (IS_ERR(p)) {
-                        err = PTR_ERR(p);
-                        goto out_allowed;
-                }
-                goto out_thread;
+                goto out_allowed;
         }
+        BUG_ON(cpu_online(cpu));
 
         /* Wait for it to sleep (leaving idle task). */
         while (!idle_cpu(cpu))
@@ -279,8 +275,6 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen)
 
         check_for_tasks(cpu);
 
-out_thread:
-        err = kthread_stop(p);
 out_allowed:
         set_cpus_allowed_ptr(current, &old_allowed);
 out_release: