29 lines
778 B
Diff
29 lines
778 B
Diff
From ac2304a6d5fc989bb859b7886ca4fb68b899aafc Mon Sep 17 00:00:00 2001
|
|
From: Thomas Gleixner <tglx@linutronix.de>
|
|
Date: Sun, 6 Nov 2011 12:26:18 +0100
|
|
Subject: [PATCH 245/290] x86-kvm-require-const-tsc-for-rt.patch
|
|
|
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
|
---
|
|
arch/x86/kvm/x86.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
|
|
index 4fc5323..18fc878 100644
|
|
--- a/arch/x86/kvm/x86.c
|
|
+++ b/arch/x86/kvm/x86.c
|
|
@@ -5210,6 +5210,13 @@ int kvm_arch_init(void *opaque)
|
|
goto out;
|
|
}
|
|
|
|
+#ifdef CONFIG_PREEMPT_RT_FULL
|
|
+ if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) {
|
|
+ printk(KERN_ERR "RT requires X86_FEATURE_CONSTANT_TSC\n");
|
|
+ return -EOPNOTSUPP;
|
|
+ }
|
|
+#endif
|
|
+
|
|
r = kvm_mmu_module_init();
|
|
if (r)
|
|
goto out;
|