diff options
Diffstat (limited to 'arch/i386')
-rw-r--r-- | arch/i386/kernel/acpi/boot.c | 7 | ||||
-rw-r--r-- | arch/i386/kernel/setup.c | 7 |
2 files changed, 7 insertions, 7 deletions
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 @@ | |||
38 | 38 | ||
39 | int __initdata acpi_force = 0; | 39 | int __initdata acpi_force = 0; |
40 | 40 | ||
41 | #ifdef CONFIG_ACPI | ||
42 | int acpi_disabled = 0; | ||
43 | #else | ||
44 | int acpi_disabled = 1; | ||
45 | #endif | ||
46 | EXPORT_SYMBOL(acpi_disabled); | ||
47 | |||
41 | #ifdef CONFIG_X86_64 | 48 | #ifdef CONFIG_X86_64 |
42 | 49 | ||
43 | extern void __init clustered_apic_check(void); | 50 | 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); | |||
89 | 89 | ||
90 | unsigned long mmu_cr4_features; | 90 | unsigned long mmu_cr4_features; |
91 | 91 | ||
92 | #ifdef CONFIG_ACPI | ||
93 | int acpi_disabled = 0; | ||
94 | #else | ||
95 | int acpi_disabled = 1; | ||
96 | #endif | ||
97 | EXPORT_SYMBOL(acpi_disabled); | ||
98 | |||
99 | /* for MCA, but anyone else can use it if they want */ | 92 | /* for MCA, but anyone else can use it if they want */ |
100 | unsigned int machine_id; | 93 | unsigned int machine_id; |
101 | #ifdef CONFIG_MCA | 94 | #ifdef CONFIG_MCA |