diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-08 18:11:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-08 18:11:19 +0200 |
| commit | e7858f52a5cb868289a72264534a1f05f3340c6c (patch) | |
| tree | aa7308603cf30d8aec6e45ecaddc6c8ed29d2edb /kernel/cpu.c | |
| parent | 27a9da6538ee18046d7bff8e36a9f783542c54c3 (diff) | |
| parent | bbf1bb3eee86f2eef2baa14e600be454d09109ee (diff) | |
| download | linux-e7858f52a5cb868289a72264534a1f05f3340c6c.tar.gz | |
Merge branch 'cpu_stop' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into sched/core
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 914aedcde849..545777574779 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -266,9 +266,6 @@ int __ref cpu_down(unsigned int cpu) { int err; - err = stop_machine_create(); - if (err) - return err; cpu_maps_update_begin(); if (cpu_hotplug_disabled) { @@ -280,7 +277,6 @@ int __ref cpu_down(unsigned int cpu) out: cpu_maps_update_done(); - stop_machine_destroy(); return err; } EXPORT_SYMBOL(cpu_down); @@ -361,9 +357,6 @@ int disable_nonboot_cpus(void) { int cpu, first_cpu, error; - error = stop_machine_create(); - if (error) - return error; cpu_maps_update_begin(); first_cpu = cpumask_first(cpu_online_mask); /* @@ -394,7 +387,6 @@ int disable_nonboot_cpus(void) printk(KERN_ERR "Non-boot CPUs are not disabled\n"); } cpu_maps_update_done(); - stop_machine_destroy(); return error; } |