diff options
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/init/main.c b/init/main.c index 450e6ee52ab6..9def935ab13a 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -397,10 +397,6 @@ static void __init smp_init(void) | |||
397 | { | 397 | { |
398 | unsigned int cpu; | 398 | unsigned int cpu; |
399 | 399 | ||
400 | #ifndef CONFIG_HOTPLUG_CPU | ||
401 | cpu_possible_map = cpu_present_map; | ||
402 | #endif | ||
403 | |||
404 | /* FIXME: This should be done in userspace --RR */ | 400 | /* FIXME: This should be done in userspace --RR */ |
405 | for_each_present_cpu(cpu) { | 401 | for_each_present_cpu(cpu) { |
406 | if (num_online_cpus() >= max_cpus) | 402 | if (num_online_cpus() >= max_cpus) |
@@ -545,10 +541,6 @@ asmlinkage void __init start_kernel(void) | |||
545 | setup_arch(&command_line); | 541 | setup_arch(&command_line); |
546 | setup_command_line(command_line); | 542 | setup_command_line(command_line); |
547 | unwind_setup(); | 543 | unwind_setup(); |
548 | #ifndef CONFIG_HOTPLUG_CPU | ||
549 | if (max_cpus < 2) | ||
550 | cpu_possible_map = cpu_online_map; | ||
551 | #endif | ||
552 | setup_per_cpu_areas(); | 544 | setup_per_cpu_areas(); |
553 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ | 545 | smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */ |
554 | 546 | ||