linux-kernel - [tip:x86/cpu] x86/cpufeature: Fix build bug caused by merge artifact with the removal of cpu_has

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-d7847a7017b2a2759dd5590c0cffdbdf2994918e@git.kernel.org>
Date:	Fri, 1 Apr 2016 00:40:27 -0700
From:	tip-bot for Ingo Molnar <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	peterz@...radead.org, tglx@...utronix.de,
	torvalds@...ux-foundation.org, fengguang.wu@...el.com, bp@...e.de,
	david.kershner@...sys.com, hpa@...or.com,
	linux-kernel@...r.kernel.org, mingo@...nel.org
Subject: [tip:x86/cpu] x86/cpufeature: Fix build bug caused by merge
 artifact with the removal of cpu_has_hypervisor

Commit-ID:  d7847a7017b2a2759dd5590c0cffdbdf2994918e
Gitweb:     http://git.kernel.org/tip/d7847a7017b2a2759dd5590c0cffdbdf2994918e
Author:     Ingo Molnar <mingo@...nel.org>
AuthorDate: Fri, 1 Apr 2016 09:00:35 +0200
Committer:  Ingo Molnar <mingo@...nel.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.wu@...el.com>
Cc: David Kershner <david.kershner@...sys.com>
Cc: Borislav Petkov <bp@...e.de>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Thomas Gleixner <tglx@...utronix.de>
Cc: sparmaintainer@...sys.com
Cc: virtualization@...ts.linux-foundation.org
Link: http://lkml.kernel.org/r/1459266123-21878-3-git-send-email-bp@alien8.de
Signed-off-by: Ingo Molnar <mingo@...nel.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();