summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/kvm.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-03-29 17:41:55 +0200
committerIngo Molnar <mingo@kernel.org>2016-03-31 13:35:07 +0200
commit0c9f3536cc712dfd5ec3127d55cd7b807cc0adb5 (patch)
tree30e5df07fb20a2dc2685b8325223f90001c38125 /arch/x86/kernel/kvm.c
parentx86/cpufeature: Remove cpu_has_arch_perfmon (diff)
downloadlinux-0c9f3536cc712dfd5ec3127d55cd7b807cc0adb5.tar.xz
linux-0c9f3536cc712dfd5ec3127d55cd7b807cc0adb5.zip
x86/cpufeature: Remove cpu_has_hypervisor
Use boot_cpu_has() instead. Tested-by: David Kershner <david.kershner@unisys.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: sparmaintainer@unisys.com Cc: virtualization@lists.linux-foundation.org Link: http://lkml.kernel.org/r/1459266123-21878-3-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/kvm.c')
-rw-r--r--arch/x86/kernel/kvm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 807950860fb7..dc1207e2f193 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -522,7 +522,7 @@ static noinline uint32_t __kvm_cpuid_base(void)
if (boot_cpu_data.cpuid_level < 0)
return 0; /* So we don't blow up on old processors */
- if (cpu_has_hypervisor)
+ if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
return hypervisor_cpuid_base("KVMKVMKVM\0\0\0", 0);
return 0;