diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpu.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index e615dfbcf794..f560598807c1 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
| @@ -447,14 +447,6 @@ EXPORT_SYMBOL_GPL(cpu_up); | |||
| 447 | #ifdef CONFIG_PM_SLEEP_SMP | 447 | #ifdef CONFIG_PM_SLEEP_SMP |
| 448 | static cpumask_var_t frozen_cpus; | 448 | static cpumask_var_t frozen_cpus; |
| 449 | 449 | ||
| 450 | void __weak arch_disable_nonboot_cpus_begin(void) | ||
| 451 | { | ||
| 452 | } | ||
| 453 | |||
| 454 | void __weak arch_disable_nonboot_cpus_end(void) | ||
| 455 | { | ||
| 456 | } | ||
| 457 | |||
| 458 | int disable_nonboot_cpus(void) | 450 | int disable_nonboot_cpus(void) |
| 459 | { | 451 | { |
| 460 | int cpu, first_cpu, error = 0; | 452 | int cpu, first_cpu, error = 0; |
| @@ -466,7 +458,6 @@ int disable_nonboot_cpus(void) | |||
| 466 | * with the userspace trying to use the CPU hotplug at the same time | 458 | * with the userspace trying to use the CPU hotplug at the same time |
| 467 | */ | 459 | */ |
| 468 | cpumask_clear(frozen_cpus); | 460 | cpumask_clear(frozen_cpus); |
| 469 | arch_disable_nonboot_cpus_begin(); | ||
| 470 | 461 | ||
| 471 | printk("Disabling non-boot CPUs ...\n"); | 462 | printk("Disabling non-boot CPUs ...\n"); |
| 472 | for_each_online_cpu(cpu) { | 463 | for_each_online_cpu(cpu) { |
| @@ -482,8 +473,6 @@ int disable_nonboot_cpus(void) | |||
| 482 | } | 473 | } |
| 483 | } | 474 | } |
| 484 | 475 | ||
| 485 | arch_disable_nonboot_cpus_end(); | ||
| 486 | |||
| 487 | if (!error) { | 476 | if (!error) { |
| 488 | BUG_ON(num_online_cpus() > 1); | 477 | BUG_ON(num_online_cpus() > 1); |
| 489 | /* Make sure the CPUs won't be enabled by someone else */ | 478 | /* Make sure the CPUs won't be enabled by someone else */ |
