aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2006-09-26 10:52:33 +0200
committerAndi Kleen <andi@basil.nowhere.org>2006-09-26 10:52:33 +0200
commitdf3bb57d2c0160ccd1ee51322f50aa295c3b0858 (patch)
tree056c22f744540d288d1ad7b5422465f66c645580
parent43c85c9c5dff76efc1e411d3302840027ea92004 (diff)
[PATCH] i386/x86-64: Move acpi_disabled variables into acpi/boot.c
Removes code duplication between i386/x86-64. Not needed anymore in setup.c since early_param cleanup Cc: len.brown@intel.com Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r--arch/i386/kernel/acpi/boot.c7
-rw-r--r--arch/i386/kernel/setup.c7
-rw-r--r--arch/x86_64/kernel/setup.c3
3 files changed, 7 insertions, 10 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 87e2ab50b69..f3761b98c8d 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/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/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index c6e31ed386f..ea17567dbe7 100644
--- a/arch/i386/kernel/setup.c
+++ b/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/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 9c4d93c53c0..0f86976811d 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/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 */