diff options
| author | Borislav Petkov <bp@suse.de> | 2016-03-29 17:41:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-31 13:35:07 +0200 |
| commit | 0c9f3536cc712dfd5ec3127d55cd7b807cc0adb5 (patch) | |
| tree | 30e5df07fb20a2dc2685b8325223f90001c38125 /arch/x86/events/intel | |
| parent | x86/cpufeature: Remove cpu_has_arch_perfmon (diff) | |
| download | linux-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/events/intel')
| -rw-r--r-- | arch/x86/events/intel/uncore.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 7012d18bb293..3f6d8b5672d5 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -1383,7 +1383,7 @@ static int __init intel_uncore_init(void) if (boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) return -ENODEV; - if (cpu_has_hypervisor) + if (boot_cpu_has(X86_FEATURE_HYPERVISOR)) return -ENODEV; max_packages = topology_max_packages(); |