From 75881d8352524321ce35032c6b55e164d04fbdb9 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 3 May 2008 22:01:31 +0200
Subject: [PATCH] --- yaml --- r: 95987 b: refs/heads/master c:
 e37ee42caadab46cec277546099fa2a6207fff0b h: refs/heads/master i:   95985:
 1996233eceeeabb70a29e5199a18d6f8a2418c08   95983:
 ba406662ca624df57b5d4fb543dd9ca9ef802487 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/mpparse.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a73ef9ad4973..6bfad85ba155 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5562faeaacf19e81a78ee37cc6b96ab1f3e68e4
+refs/heads/master: e37ee42caadab46cec277546099fa2a6207fff0b
diff --git a/trunk/arch/x86/kernel/mpparse.c b/trunk/arch/x86/kernel/mpparse.c
index 3e2c54dc8b29..404683b94e79 100644
--- a/trunk/arch/x86/kernel/mpparse.c
+++ b/trunk/arch/x86/kernel/mpparse.c
@@ -794,6 +794,11 @@ void __init find_smp_config(void)
                             ACPI-based MP Configuration
    -------------------------------------------------------------------------- */
 
+/*
+ * Keep this outside and initialized to 0, for !CONFIG_ACPI builds:
+ */
+int es7000_plat;
+
 #ifdef CONFIG_ACPI
 
 #ifdef	CONFIG_X86_IO_APIC
@@ -909,8 +914,6 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi)
 	MP_intsrc_info(&intsrc);
 }
 
-int es7000_plat;
-
 void __init mp_config_acpi_legacy_irqs(void)
 {
 	struct mpc_config_intsrc intsrc;