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

Don't panic when io apic id cannot be set.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index e66a865f6cc9fcc27402e16087ac29fe2ddd7584..590264a15e21c290f01ccf1dee7edcd9f5eb0965 100644 (file)
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -1230,7 +1230,7 @@ static void __init setup_ioapic_ids_from_mpc (void)
                reg_00.raw = io_apic_read(apic, 0);
                spin_unlock_irqrestore(&ioapic_lock, flags);
                if (reg_00.bits.ID != mp_ioapics[apic].mpc_apicid)
-                       panic("could not set ID!\n");
+                       printk("could not set ID!\n");
                else
                        apic_printk(APIC_VERBOSE," ok.\n");
        }