[PATCH v2 09/12] x86/jailhouse: Silence ACPI warning

Jan Kiszka
2017-11-27T08:13:32Z

From: Jan Kiszka <jan.kiszka@siemens.com>

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>
---
arch/x86/kernel/jailhouse.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/arch/x86/kernel/jailhouse.c b/arch/x86/kernel/jailhouse.c
index f5f459bb7aac..36feb0e4b4fe 100644
--- a/arch/x86/kernel/jailhouse.c
+++ b/arch/x86/kernel/jailhouse.c
@@ -127,6 +127,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)
--
2.12.3