Skip to content

Commit

Permalink
x86/jailhouse: Silence ACPI warning
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Jan Kiszka authored and Thomas Gleixner committed Jan 14, 2018
1 parent 0d7c1e2 commit 5ae4443
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions arch/x86/kernel/jailhouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 5ae4443

Please sign in to comment.