diff options
| author | Andi Kleen <ak@suse.de> | 2006-09-26 04:52:33 -0400 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:33 -0400 |
| commit | df3bb57d2c0160ccd1ee51322f50aa295c3b0858 (patch) | |
| tree | 056c22f744540d288d1ad7b5422465f66c645580 /arch/i386/kernel/acpi/boot.c | |
| parent | 43c85c9c5dff76efc1e411d3302840027ea92004 (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>
Diffstat (limited to 'arch/i386/kernel/acpi/boot.c')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 7 |
1 files changed, 7 insertions, 0 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); |