x86/cpufeature: Fix build bug caused by merge artifact with the removal of cpu_has_hy...
authorIngo Molnar <mingo@kernel.org>
Fri, 1 Apr 2016 07:00:35 +0000 (09:00 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 1 Apr 2016 07:03:27 +0000 (09:03 +0200)
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.wu@intel.com>
Cc: David Kershner <david.kershner@unisys.com>
Cc: 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>
arch/x86/events/intel/cstate.c

index 7946c4231169ff81ed2c22cd538cdf289e8930f2..d5045c8e2e635097ace07f9f4761f6e61382778c 100644 (file)
@@ -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();