|
@@ -1084,7 +1084,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
|
|
|
{
|
|
|
unsigned int i;
|
|
|
|
|
|
- preempt_disable();
|
|
|
smp_cpu_index_default();
|
|
|
|
|
|
/*
|
|
@@ -1102,22 +1101,19 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
|
|
|
}
|
|
|
set_cpu_sibling_map(0);
|
|
|
|
|
|
-
|
|
|
if (smp_sanity_check(max_cpus) < 0) {
|
|
|
pr_info("SMP disabled\n");
|
|
|
disable_smp();
|
|
|
- goto out;
|
|
|
+ return;
|
|
|
}
|
|
|
|
|
|
default_setup_apic_routing();
|
|
|
|
|
|
- preempt_disable();
|
|
|
if (read_apic_id() != boot_cpu_physical_apicid) {
|
|
|
panic("Boot APIC ID in local APIC unexpected (%d vs %d)",
|
|
|
read_apic_id(), boot_cpu_physical_apicid);
|
|
|
/* Or can we switch back to PIC here? */
|
|
|
}
|
|
|
- preempt_enable();
|
|
|
|
|
|
connect_bsp_APIC();
|
|
|
|
|
@@ -1151,8 +1147,6 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus)
|
|
|
uv_system_init();
|
|
|
|
|
|
set_mtrr_aps_delayed_init();
|
|
|
-out:
|
|
|
- preempt_enable();
|
|
|
}
|
|
|
|
|
|
void arch_enable_nonboot_cpus_begin(void)
|