aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/io_apic.c
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-08-21 12:56:32 -0700
committerIngo Molnar <mingo@elte.hu>2008-10-16 16:52:59 +0200
commita2d332fa3445160519de03c350a59602ac1c3df9 (patch)
treefb86287f507290b6546f993916e097c12eb2081d /arch/x86/kernel/io_apic.c
parente89eb43863c2d9f11a3bbe766766fe646e6c50d9 (diff)
downloadkernel_samsung_smdk4412-a2d332fa3445160519de03c350a59602ac1c3df9.zip
kernel_samsung_smdk4412-a2d332fa3445160519de03c350a59602ac1c3df9.tar.gz
kernel_samsung_smdk4412-a2d332fa3445160519de03c350a59602ac1c3df9.tar.bz2
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>
Diffstat (limited to 'arch/x86/kernel/io_apic.c')
-rw-r--r--arch/x86/kernel/io_apic.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c
index 7ca5566..4e44fd1 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