Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df3bb57d authored by Andi Kleen's avatar Andi Kleen Committed by Andi Kleen
Browse files

[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: default avatarAndi Kleen <ak@suse.de>
parent 43c85c9c

arch/i386/kernel/acpi/boot.c

+7 −0
Original line number Diff line number Diff line
@@ -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);

arch/i386/kernel/setup.c

+0 −7
Original line number Diff line number Diff line
@@ -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

arch/x86_64/kernel/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -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 */