Commit-ID: d7847a7017b2a2759dd5590c0cffdbdf2994918e
Gitweb: http://git.kernel.org/tip/d7847a7017b2a2759dd5590c0cffdbdf2994918e
Author: Ingo Molnar <mi...@kernel.org>
AuthorDate: Fri, 1 Apr 2016 09:00:35 +0200
Committer: Ingo Molnar <mi...@kernel.org>
CommitDate: Fri, 1 Apr 2016 09:03:27 +0200
x86/cpufeature: Fix build bug caused by merge artifact with the removal of
cpu_has_hypervisor
The 0-day build robot by Fengguang Wu reported a build failure:
arch/x86/events//intel/cstate.c: In function 'cstate_pmu_init':
arch/x86/events//intel/cstate.c:680:6: error: 'cpu_has_hypervisor'
undeclared (first use in this function)
... which was caused by a merge mistake I made when applying
the following patch:
0c9f3536cc71 ("x86/cpufeature: Remove cpu_has_hypervisor")
apply the missing hunk as well.
Reported-by: kbuild test robot <fengguang...@intel.com>
Cc: David Kershner <david.kersh...@unisys.com>
Cc: Borislav Petkov <b...@suse.de>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: sparmaintai...@unisys.com
Cc: virtualizat...@lists.linux-foundation.org
Link: http://lkml.kernel.org/r/1459266123-21878-3-git-send-email...@alien8.de
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
arch/x86/events/intel/cstate.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index 7946c42..d5045c8 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -677,7 +677,7 @@ static int __init cstate_pmu_init(void)
{
int err;
- if (cpu_has_hypervisor)
+ if (boot_cpu_has(X86_FEATURE_HYPERVISOR))
return -ENODEV;
err = cstate_init();
