diff --git a/[refs] b/[refs] index 0ca3789242e3..74ca7287056e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d4a34c9365c6e3f94a5b26ce296e1fce9b66c8b +refs/heads/master: 112cecb2cc0e7341db92281ba04b26c41bb8146d diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c index 272254f20d97..9124669f4586 100644 --- a/trunk/kernel/cpu.c +++ b/trunk/kernel/cpu.c @@ -270,11 +270,7 @@ int disable_nonboot_cpus(void) goto out; } } - error = set_cpus_allowed(current, cpumask_of_cpu(first_cpu)); - if (error) { - printk(KERN_ERR "Could not run on CPU%d\n", first_cpu); - goto out; - } + /* We take down all of the non-boot CPUs in one shot to avoid races * with the userspace trying to use the CPU hotplug at the same time */