From: Andi Kleen <ak@muc.de>

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>
---

 25-akpm/arch/x86_64/kernel/io_apic.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/x86_64/kernel/io_apic.c~x86-64-avoid-panic-when-apic-id-cannot-be-set arch/x86_64/kernel/io_apic.c
--- 25/arch/x86_64/kernel/io_apic.c~x86-64-avoid-panic-when-apic-id-cannot-be-set	Tue Sep 14 17:02:35 2004
+++ 25-akpm/arch/x86_64/kernel/io_apic.c	Tue Sep 14 17:02:35 2004
@@ -1230,7 +1230,7 @@ static void __init setup_ioapic_ids_from
 		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");
 	}
_