diff options
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 857a88bb9195..8dd201c31329 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -1261,7 +1261,7 @@ void __init native_smp_cpus_done(unsigned int max_cpus) | |||
1261 | check_nmi_watchdog(); | 1261 | check_nmi_watchdog(); |
1262 | } | 1262 | } |
1263 | 1263 | ||
1264 | static int additional_cpus __initdata = CONFIG_HOTPLUG_ADDITIONAL_CPUS; | 1264 | static int additional_cpus = -1; |
1265 | 1265 | ||
1266 | /* | 1266 | /* |
1267 | * cpu_possible_map should be static, it cannot change as cpu's | 1267 | * cpu_possible_map should be static, it cannot change as cpu's |
@@ -1334,12 +1334,6 @@ static void remove_siblinginfo(int cpu) | |||
1334 | cpu_clear(cpu, cpu_sibling_setup_map); | 1334 | cpu_clear(cpu, cpu_sibling_setup_map); |
1335 | } | 1335 | } |
1336 | 1336 | ||
1337 | static __init int setup_additional_cpus(char *s) | ||
1338 | { | ||
1339 | return s && get_option(&s, &additional_cpus) ? 0 : -EINVAL; | ||
1340 | } | ||
1341 | early_param("additional_cpus", setup_additional_cpus); | ||
1342 | |||
1343 | static void __ref remove_cpu_from_maps(int cpu) | 1337 | static void __ref remove_cpu_from_maps(int cpu) |
1344 | { | 1338 | { |
1345 | cpu_clear(cpu, cpu_online_map); | 1339 | cpu_clear(cpu, cpu_online_map); |