diff options
Diffstat (limited to 'kernel/cpu.c')
| -rw-r--r-- | kernel/cpu.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c index 8ce10043e4ac..6ba0f1ecb212 100644 --- a/kernel/cpu.c +++ b/kernel/cpu.c | |||
| @@ -401,6 +401,7 @@ int disable_nonboot_cpus(void) | |||
| 401 | break; | 401 | break; |
| 402 | } | 402 | } |
| 403 | } | 403 | } |
| 404 | |||
| 404 | if (!error) { | 405 | if (!error) { |
| 405 | BUG_ON(num_online_cpus() > 1); | 406 | BUG_ON(num_online_cpus() > 1); |
| 406 | /* Make sure the CPUs won't be enabled by someone else */ | 407 | /* Make sure the CPUs won't be enabled by someone else */ |
| @@ -413,6 +414,14 @@ int disable_nonboot_cpus(void) | |||
| 413 | return error; | 414 | return error; |
| 414 | } | 415 | } |
| 415 | 416 | ||
| 417 | void __weak arch_enable_nonboot_cpus_begin(void) | ||
| 418 | { | ||
| 419 | } | ||
| 420 | |||
| 421 | void __weak arch_enable_nonboot_cpus_end(void) | ||
| 422 | { | ||
| 423 | } | ||
| 424 | |||
| 416 | void __ref enable_nonboot_cpus(void) | 425 | void __ref enable_nonboot_cpus(void) |
| 417 | { | 426 | { |
| 418 | int cpu, error; | 427 | int cpu, error; |
| @@ -424,6 +433,9 @@ void __ref enable_nonboot_cpus(void) | |||
| 424 | goto out; | 433 | goto out; |
| 425 | 434 | ||
| 426 | printk("Enabling non-boot CPUs ...\n"); | 435 | printk("Enabling non-boot CPUs ...\n"); |
| 436 | |||
| 437 | arch_enable_nonboot_cpus_begin(); | ||
| 438 | |||
| 427 | for_each_cpu(cpu, frozen_cpus) { | 439 | for_each_cpu(cpu, frozen_cpus) { |
| 428 | error = _cpu_up(cpu, 1); | 440 | error = _cpu_up(cpu, 1); |
| 429 | if (!error) { | 441 | if (!error) { |
| @@ -432,6 +444,9 @@ void __ref enable_nonboot_cpus(void) | |||
| 432 | } | 444 | } |
| 433 | printk(KERN_WARNING "Error taking CPU%d up: %d\n", cpu, error); | 445 | printk(KERN_WARNING "Error taking CPU%d up: %d\n", cpu, error); |
| 434 | } | 446 | } |
| 447 | |||
| 448 | arch_enable_nonboot_cpus_end(); | ||
| 449 | |||
| 435 | cpumask_clear(frozen_cpus); | 450 | cpumask_clear(frozen_cpus); |
| 436 | out: | 451 | out: |
| 437 | cpu_maps_update_done(); | 452 | cpu_maps_update_done(); |
