aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/acpi/boot.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/acpi/boot.c')
-rw-r--r--arch/x86/kernel/acpi/boot.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 4c51a2f8fd31..db1a90a76b3e 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -47,7 +47,7 @@
47#endif 47#endif
48 48
49static int __initdata acpi_force = 0; 49static int __initdata acpi_force = 0;
50 50u32 acpi_rsdt_forced;
51#ifdef CONFIG_ACPI 51#ifdef CONFIG_ACPI
52int acpi_disabled = 0; 52int acpi_disabled = 0;
53#else 53#else
@@ -1783,6 +1783,10 @@ static int __init parse_acpi(char *arg)
1783 disable_acpi(); 1783 disable_acpi();
1784 acpi_ht = 1; 1784 acpi_ht = 1;
1785 } 1785 }
1786 /* acpi=rsdt use RSDT instead of XSDT */
1787 else if (strcmp(arg, "rsdt") == 0) {
1788 acpi_rsdt_forced = 1;
1789 }
1786 /* "acpi=noirq" disables ACPI interrupt routing */ 1790 /* "acpi=noirq" disables ACPI interrupt routing */
1787 else if (strcmp(arg, "noirq") == 0) { 1791 else if (strcmp(arg, "noirq") == 0) {
1788 acpi_noirq_set(); 1792 acpi_noirq_set();