summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-11-06 11:26:18 (GMT)
committerScott Wood <scottwood@freescale.com>2015-02-13 22:21:01 (GMT)
commit4b76bf9ee96f552adb4e08b6570cc55c9554b0e0 (patch)
treebb0975db5a033b0ffee15e51fa80a511d0095e80 /arch/x86
parent7ab9314592b41fa794a905753eeeb70e683f6477 (diff)
downloadlinux-fsl-qoriq-4b76bf9ee96f552adb4e08b6570cc55c9554b0e0.tar.xz
x86-kvm-require-const-tsc-for-rt.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/x86.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 790551b..14915fe 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -5522,6 +5522,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_free_percpu;