Skip to content

Commit 5ae4443

Browse files
jan-kiszkaKAGA-KOKO
authored andcommitted
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 <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Cc: [email protected] Link: https://lkml.kernel.org/r/939687007cbd7643b02fd330e8616e7e5944063f.1511770314.git.jan.kiszka@siemens.com
1 parent 0d7c1e2 commit 5ae4443

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

arch/x86/kernel/jailhouse.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@ static void __init jailhouse_init_platform(void)
125125
pr_debug("Jailhouse: PM-Timer IO Port: %#x\n", pmtmr_ioport);
126126

127127
precalibrated_tsc_khz = setup_data.tsc_khz;
128+
129+
/*
130+
* Avoid that the kernel complains about missing ACPI tables - there
131+
* are none in a non-root cell.
132+
*/
133+
disable_acpi();
128134
}
129135

130136
bool jailhouse_paravirt(void)

0 commit comments

Comments
 (0)