x86/jailhouse: Silence ACPI warning

Jailhouse support does not depend on ACPI, and does not even use it. But
if it should be enabled, avoid warning about its absence in the
platform.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: jailhouse-dev@googlegroups.com
Link: https://lkml.kernel.org/r/939687007cbd7643b02fd330e8616e7e5944063f.1511770314.git.jan.kiszka@siemens.com

diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c
index b9f116d62f81f62c51c93923a1b812c68eb0a220..54469ef4c3c70f4b4a37c39f0b75e838fbf13f52 100644 (file)
--- a/arch/x86/kernel/jailhouse.c
+++ b/arch/x86/kernel/jailhouse.c
@@ -125,6 +125,12 @@ static void __init jailhouse_init_platform(void)
        pr_debug("Jailhouse: PM-Timer IO Port: %#x\n", pmtmr_ioport);
 
        precalibrated_tsc_khz = setup_data.tsc_khz;
+
+       /*
+        * Avoid that the kernel complains about missing ACPI tables - there
+        * are none in a non-root cell.
+        */
+       disable_acpi();
 }
 
 bool jailhouse_paravirt(void)