summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/mpspec.h
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-05-16 00:05:16 +0400
committerIngo Molnar <mingo@elte.hu>2009-05-18 11:33:29 +0400
commitf1bdb523880c7f6990e9e8e50b0fc972ca475e84 (patch)
treebf46a5a0f06b5b1a28cc392ee0aab0d454951915 /arch/x86/include/asm/mpspec.h
parent629e15d245f46bef9d26199b450f882f9437a8fe (diff)
downloadlinux-f1bdb523880c7f6990e9e8e50b0fc972ca475e84.tar.xz
x86, irq: don't call mp_config_acpi_gsi() if update_mptable is not enabled
Len expressed concern that the update_mptable feature has side-effects on the ACPI code. Make it sure explicitly that the code only ever gets called if the (default disabled) update_mptable boot quirk option is disabled. [ Impact: isolate the update_mptable feature from ACPI code more ] Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: Len Brown <lenb@kernel.org> LKML-Reference: <4A0DC832.5090200@kernel.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/mpspec.h')
-rw-r--r--arch/x86/include/asm/mpspec.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
index c34961a45ec0..3dcbaaaa363e 100644
--- a/arch/x86/include/asm/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
@@ -87,6 +87,15 @@ static inline int acpi_probe_gsi(void)
}
#endif /* CONFIG_ACPI */
+#ifdef CONFIG_X86_MPPARSE
+extern int enable_update_mptable;
+#else
+static inline int enable_update_mptable(void)
+{
+ return 0;
+}
+#endif
+
#define PHYSID_ARRAY_SIZE BITS_TO_LONGS(MAX_APICS)
struct physid_mask {