mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
[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>
This commit is contained in:
parent
43c85c9c5d
commit
df3bb57d2c
3 changed files with 7 additions and 10 deletions
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue