From: Andi Kleen <ak@suse.de>
Date: Tue, 26 Sep 2006 08:52:33 +0000 (+0200)
Subject: [PATCH] i386/x86-64: Move acpi_disabled variables into acpi/boot.c
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=df3bb57d2c0160ccd1ee51322f50aa295c3b0858;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[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>
---

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 87e2ab50b694..f3761b98c8dd 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 c6e31ed386f5..ea17567dbe72 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 9c4d93c53c06..0f86976811d6 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 */