Commit e4d459dc authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

[PATCH] x86-64: avoid panic when APIC ID cannot be set

Don't panic when io apic id cannot be set.
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b5066102
...@@ -1230,7 +1230,7 @@ static void __init setup_ioapic_ids_from_mpc (void) ...@@ -1230,7 +1230,7 @@ static void __init setup_ioapic_ids_from_mpc (void)
reg_00.raw = io_apic_read(apic, 0); reg_00.raw = io_apic_read(apic, 0);
spin_unlock_irqrestore(&ioapic_lock, flags); spin_unlock_irqrestore(&ioapic_lock, flags);
if (reg_00.bits.ID != mp_ioapics[apic].mpc_apicid) if (reg_00.bits.ID != mp_ioapics[apic].mpc_apicid)
panic("could not set ID!\n"); printk("could not set ID!\n");
else else
apic_printk(APIC_VERBOSE," ok.\n"); apic_printk(APIC_VERBOSE," ok.\n");
} }
......
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