From: Yinghai Lu <yhlu.kernel@gmail.com>
Date: Thu, 21 Aug 2008 19:56:32 +0000 (-0700)
Subject: x86: fix 32-bit ioapic lockup with sparseirqs
X-Git-Tag: v2.6.28-rc1~80^2~93
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a2d332fa3445160519de03c350a59602ac1c3df9;p=linux-2.6-omap-h63xx.git

x86: fix 32-bit ioapic lockup with sparseirqs

Missed two lines when copying.

Fix panic on one of Ingo's machines that need to adjust ioapic id when
acpi off/ 32bit.

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index 7ca55669047..4e44fd1f466 100644
--- a/arch/x86/kernel/io_apic.c
+++ b/arch/x86/kernel/io_apic.c
@@ -2077,6 +2077,8 @@ static void __init setup_ioapic_ids_from_mpc(void)
 
 		reg_00.bits.ID = mp_ioapics[apic].mp_apicid;
 		spin_lock_irqsave(&ioapic_lock, flags);
+		io_apic_write(apic, 0, reg_00.raw);
+		spin_unlock_irqrestore(&ioapic_lock, flags);
 
 		/*
 		 * Sanity check