[PATCH for review] [93/145] i386/x86-64: Move acpi_disabled variables into acpi/boot.c

Andi Kleen
2006-08-10T20:00:17Z

r

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>

---
arch/i386/kernel/acpi/boot.c | 7 +++++++
arch/i386/kernel/setup.c | 7 -------
arch/x86_64/kernel/setup.c | 3 ---
3 files changed, 7 insertions(+), 10 deletions(-)

Index: linux/arch/i386/kernel/acpi/boot.c
===================================================================
--- linux.orig/arch/i386/kernel/acpi/boot.c
+++ linux/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);
Index: linux/arch/i386/kernel/setup.c
===================================================================
--- linux.orig/arch/i386/kernel/setup.c
+++ linux/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
Index: linux/arch/x86_64/kernel/setup.c
===================================================================
--- linux.orig/arch/x86_64/kernel/setup.c
+++ linux/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 */