summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-14 01:26:41 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-08 10:36:40 +0200
commitd867e5310bd3c560093d39669ef52ff7f1b5711a (patch)
tree3be9c3a370de73eef951be4d6bd530064aa9fd3b /arch/x86/kernel/acpi
parent9a27f5c51629c3d3b7718dd4be3d2722b472fafe (diff)
downloadblackbird-op-linux-d867e5310bd3c560093d39669ef52ff7f1b5711a.tar.gz
blackbird-op-linux-d867e5310bd3c560093d39669ef52ff7f1b5711a.zip
x86: keep MP_intsrc_info untouched if we do not update mptable
Daniel Exner reported IO-APIC enumeration breakage in linux-next. Alexey Starikovskiy found out that it might be related to commit 2944e16b25 "x86: update mptable". use enable_update_mptable to decide if need check before add mp_irqs array. Reported-by: Daniel Exner <webmaster@dragonslave.de> Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/acpi')
-rw-r--r--arch/x86/kernel/acpi/boot.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index caf4ed7ca069..4d370b1c5ae8 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -1172,6 +1172,9 @@ int mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin,
struct mpc_config_intsrc intsrc;
int ioapic;
+ if (!enable_update_mptable)
+ return 0;
+
/* print the entry should happen on mptable identically */
intsrc.mpc_type = MP_INTSRC;
intsrc.mpc_irqtype = mp_INT;
OpenPOWER on IntegriCloud