ACPI now requires the acpi_force global. Signed-off-by: Andrew Morton --- 25-akpm/arch/x86_64/kernel/setup.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/x86_64/kernel/setup.c~acpi-x86_64-build-fix arch/x86_64/kernel/setup.c --- 25/arch/x86_64/kernel/setup.c~acpi-x86_64-build-fix 2004-09-11 17:24:47.917592888 -0700 +++ 25-akpm/arch/x86_64/kernel/setup.c 2004-09-11 17:24:47.921592280 -0700 @@ -71,7 +71,7 @@ EXPORT_SYMBOL(acpi_disabled); #ifdef CONFIG_ACPI_BOOT extern int __initdata acpi_ht; extern acpi_interrupt_flags acpi_sci_flags; -/* int __initdata acpi_force = 0; */ +int __initdata acpi_force = 0; #endif /* For PCI or other memory-mapped resources */ @@ -251,14 +251,14 @@ static __init void parse_cmdline_early ( if (!memcmp(from, "acpi=force", 10)) { /* add later when we do DMI horrors: */ - /* acpi_force = 1; */ + acpi_force = 1; acpi_disabled = 0; } /* acpi=ht just means: do ACPI MADT parsing at bootup, but don't enable the full ACPI interpreter */ if (!memcmp(from, "acpi=ht", 7)) { - /* if (!acpi_force) */ + if (!acpi_force) disable_acpi(); acpi_ht = 1; } _