diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2015-02-11 15:15:10 +1030 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2015-02-11 16:47:34 +1030 |
| commit | ee72576c143d8e9081ae1fe8644122454dd323c5 (patch) | |
| tree | 23410406cc9fa1c16f2963b895dee180b02caed5 /arch/x86/lguest | |
| parent | 7313d5217e6b9817897172d6a6ff477bdc415ed6 (diff) | |
| download | blackbird-op-linux-ee72576c143d8e9081ae1fe8644122454dd323c5.tar.gz blackbird-op-linux-ee72576c143d8e9081ae1fe8644122454dd323c5.zip | |
lguest: disable ACPI explicitly.
Once we add PCI, it starts trying to manage our interrupts.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'arch/x86/lguest')
| -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 @@ #include <linux/virtio_console.h> #include <linux/pm.h> #include <linux/export.h> +#include <asm/acpi.h> #include <asm/apic.h> #include <asm/lguest.h> #include <asm/paravirt.h> @@ -1428,6 +1429,9 @@ __init void lguest_init(void) /* Register our very early console. */ virtio_cons_early_init(early_put_chars); + /* Don't let ACPI try to control our PCI interrupts. */ + disable_acpi(); + /* * Last of all, we set the power management poweroff hook to point to * the Guest routine to power off, and the reboot hook to our restart |
