Commit f6dfc265 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Remove overenthusiastic BUG in smp_boot_cpus

From: "Martin J. Bligh" <mbligh@aracnet.com>

There's no real need to BUG and stop the system from booting if the BIOS
spec'ed apicid for the boot CPU isn't correct - we can continue perfectly
well with the real one.
parent 8c357c02
...@@ -948,6 +948,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus) ...@@ -948,6 +948,7 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
printk("CPU%d: ", 0); printk("CPU%d: ", 0);
print_cpu_info(&cpu_data[0]); print_cpu_info(&cpu_data[0]);
boot_cpu_physical_apicid = GET_APIC_ID(apic_read(APIC_ID));
boot_cpu_logical_apicid = logical_smp_processor_id(); boot_cpu_logical_apicid = logical_smp_processor_id();
current_thread_info()->cpu = 0; current_thread_info()->cpu = 0;
...@@ -1008,8 +1009,6 @@ static void __init smp_boot_cpus(unsigned int max_cpus) ...@@ -1008,8 +1009,6 @@ static void __init smp_boot_cpus(unsigned int max_cpus)
setup_local_APIC(); setup_local_APIC();
map_cpu_to_logical_apicid(); map_cpu_to_logical_apicid();
if (GET_APIC_ID(apic_read(APIC_ID)) != boot_cpu_physical_apicid)
BUG();
setup_portio_remap(); setup_portio_remap();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment