Commit 8960df9a authored by Len Brown's avatar Len Brown

[ACPI] x86_64 build fix

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 1c924c71
......@@ -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 */
......@@ -248,14 +248,14 @@ static __init void parse_cmdline_early (char ** cmdline_p)
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;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment