From 4c484061f720fc31af4ae98fabcc4b7f45300a7d Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 26 Sep 2006 10:52:33 +0200
Subject: [PATCH] --- yaml --- r: 35853 b: refs/heads/master c:
 df3bb57d2c0160ccd1ee51322f50aa295c3b0858 h: refs/heads/master i:   35851:
 6ac845d631e93c9d9fc80466e7d3c3c13ed140d8 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/i386/kernel/acpi/boot.c | 7 +++++++
 trunk/arch/i386/kernel/setup.c     | 7 -------
 trunk/arch/x86_64/kernel/setup.c   | 3 ---
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index a0b497ed3603..9228807bbbee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43c85c9c5dff76efc1e411d3302840027ea92004
+refs/heads/master: df3bb57d2c0160ccd1ee51322f50aa295c3b0858
diff --git a/trunk/arch/i386/kernel/acpi/boot.c b/trunk/arch/i386/kernel/acpi/boot.c
index 87e2ab50b694..f3761b98c8dd 100644
--- a/trunk/arch/i386/kernel/acpi/boot.c
+++ b/trunk/arch/i386/kernel/acpi/boot.c
@@ -38,6 +38,13 @@
 
 int __initdata acpi_force = 0;
 
+#ifdef	CONFIG_ACPI
+int acpi_disabled = 0;
+#else
+int acpi_disabled = 1;
+#endif
+EXPORT_SYMBOL(acpi_disabled);
+
 #ifdef	CONFIG_X86_64
 
 extern void __init clustered_apic_check(void);
diff --git a/trunk/arch/i386/kernel/setup.c b/trunk/arch/i386/kernel/setup.c
index c6e31ed386f5..ea17567dbe72 100644
--- a/trunk/arch/i386/kernel/setup.c
+++ b/trunk/arch/i386/kernel/setup.c
@@ -89,13 +89,6 @@ EXPORT_SYMBOL(boot_cpu_data);
 
 unsigned long mmu_cr4_features;
 
-#ifdef	CONFIG_ACPI
-	int acpi_disabled = 0;
-#else
-	int acpi_disabled = 1;
-#endif
-EXPORT_SYMBOL(acpi_disabled);
-
 /* for MCA, but anyone else can use it if they want */
 unsigned int machine_id;
 #ifdef CONFIG_MCA
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index 9c4d93c53c06..0f86976811d6 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -74,9 +74,6 @@ EXPORT_SYMBOL(boot_cpu_data);
 
 unsigned long mmu_cr4_features;
 
-int acpi_disabled;
-EXPORT_SYMBOL(acpi_disabled);
-
 int acpi_numa __initdata;
 
 /* Boot loader ID as an integer, for the benefit of proc_dointvec */