From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 11 Feb 2015 04:45:10 +0000 (+1030)
Subject: lguest: disable ACPI explicitly.
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ee72576c143d8e9081ae1fe8644122454dd323c5;p=openwrt%2Fstaging%2Fblogic.git

lguest: disable ACPI explicitly.

Once we add PCI, it starts trying to manage our interrupts.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
---

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