OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0d7c1e2
)
x86/jailhouse: Silence ACPI warning
author
Jan Kiszka
<jan.kiszka@siemens.com>
Mon, 27 Nov 2017 08:11:51 +0000
(09:11 +0100)
committer
Thomas Gleixner
<tglx@linutronix.de>
Sun, 14 Jan 2018 20:11:56 +0000
(21:11 +0100)
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
arch/x86/kernel/jailhouse.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/jailhouse.c
b/arch/x86/kernel/jailhouse.c
index
b9f116d
..
54469ef
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)