diff options
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
-rw-r--r-- | arch/x86/kernel/smpboot.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index fff8ebaa554f..197300bfebd2 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -996,7 +996,6 @@ do_rest: | |||
996 | #endif | 996 | #endif |
997 | cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */ | 997 | cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */ |
998 | cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */ | 998 | cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */ |
999 | cpu_clear(cpu, cpu_possible_map); | ||
1000 | cpu_clear(cpu, cpu_present_map); | 999 | cpu_clear(cpu, cpu_present_map); |
1001 | per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; | 1000 | per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; |
1002 | } | 1001 | } |
@@ -1190,6 +1189,7 @@ static void __init smp_cpu_index_default(void) | |||
1190 | */ | 1189 | */ |
1191 | void __init native_smp_prepare_cpus(unsigned int max_cpus) | 1190 | void __init native_smp_prepare_cpus(unsigned int max_cpus) |
1192 | { | 1191 | { |
1192 | preempt_disable(); | ||
1193 | nmi_watchdog_default(); | 1193 | nmi_watchdog_default(); |
1194 | smp_cpu_index_default(); | 1194 | smp_cpu_index_default(); |
1195 | current_cpu_data = boot_cpu_data; | 1195 | current_cpu_data = boot_cpu_data; |
@@ -1206,7 +1206,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
1206 | if (smp_sanity_check(max_cpus) < 0) { | 1206 | if (smp_sanity_check(max_cpus) < 0) { |
1207 | printk(KERN_INFO "SMP disabled\n"); | 1207 | printk(KERN_INFO "SMP disabled\n"); |
1208 | disable_smp(); | 1208 | disable_smp(); |
1209 | return; | 1209 | goto out; |
1210 | } | 1210 | } |
1211 | 1211 | ||
1212 | preempt_disable(); | 1212 | preempt_disable(); |
@@ -1246,6 +1246,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
1246 | printk(KERN_INFO "CPU%d: ", 0); | 1246 | printk(KERN_INFO "CPU%d: ", 0); |
1247 | print_cpu_info(&cpu_data(0)); | 1247 | print_cpu_info(&cpu_data(0)); |
1248 | setup_boot_clock(); | 1248 | setup_boot_clock(); |
1249 | out: | ||
1250 | preempt_enable(); | ||
1249 | } | 1251 | } |
1250 | /* | 1252 | /* |
1251 | * Early setup to make printk work. | 1253 | * Early setup to make printk work. |