diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2015-02-10 23:45:10 -0500 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2015-02-11 01:17:34 -0500 |
commit | ee72576c143d8e9081ae1fe8644122454dd323c5 (patch) | |
tree | 23410406cc9fa1c16f2963b895dee180b02caed5 | |
parent | 7313d5217e6b9817897172d6a6ff477bdc415ed6 (diff) |
lguest: disable ACPI explicitly.
Once we add PCI, it starts trying to manage our interrupts.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
-rw-r--r-- | arch/x86/lguest/boot.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index 47ec7f201d27..aa6e3b4ce29c 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
@@ -56,6 +56,7 @@ | |||
56 | #include <linux/virtio_console.h> | 56 | #include <linux/virtio_console.h> |
57 | #include <linux/pm.h> | 57 | #include <linux/pm.h> |
58 | #include <linux/export.h> | 58 | #include <linux/export.h> |
59 | #include <asm/acpi.h> | ||
59 | #include <asm/apic.h> | 60 | #include <asm/apic.h> |
60 | #include <asm/lguest.h> | 61 | #include <asm/lguest.h> |
61 | #include <asm/paravirt.h> | 62 | #include <asm/paravirt.h> |
@@ -1428,6 +1429,9 @@ __init void lguest_init(void) | |||
1428 | /* Register our very early console. */ | 1429 | /* Register our very early console. */ |
1429 | virtio_cons_early_init(early_put_chars); | 1430 | virtio_cons_early_init(early_put_chars); |
1430 | 1431 | ||
1432 | /* Don't let ACPI try to control our PCI interrupts. */ | ||
1433 | disable_acpi(); | ||
1434 | |||
1431 | /* | 1435 | /* |
1432 | * Last of all, we set the power management poweroff hook to point to | 1436 | * Last of all, we set the power management poweroff hook to point to |
1433 | * the Guest routine to power off, and the reboot hook to our restart | 1437 | * the Guest routine to power off, and the reboot hook to our restart |