Date: Fri, 1 Apr 2016 09:51:04 +0200
From: Borislav Petkov <bp@suse.de>
To: mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com,
        david.kershner@unisys.com, peterz@infradead.org,
        fengguang.wu@intel.com, torvalds@linux-foundation.org,
        tglx@linutronix.de
Cc: linux-tip-commits@vger.kernel.org
Subject: Re: [tip:x86/cpu] x86/cpufeature: Fix build bug caused by merge
 artifact with the removal of cpu_has_hypervisor
Message-ID: <20160401075104.GB15347@pd.tnic>
References: <1459266123-21878-3-git-send-email-bp@alien8.de>
 <tip-d7847a7017b2a2759dd5590c0cffdbdf2994918e@git.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <tip-d7847a7017b2a2759dd5590c0cffdbdf2994918e@git.kernel.org>
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 2094
Lines: 58

On Fri, Apr 01, 2016 at 12:40:27AM -0700, tip-bot for Ingo Molnar wrote:
> Commit-ID:  d7847a7017b2a2759dd5590c0cffdbdf2994918e
> Gitweb:     http://git.kernel.org/tip/d7847a7017b2a2759dd5590c0cffdbdf2994918e
> Author:     Ingo Molnar <mingo@kernel.org>
> AuthorDate: Fri, 1 Apr 2016 09:00:35 +0200
> Committer:  Ingo Molnar <mingo@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.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 | 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();

Acked-by: Borislav Petkov <bp@suse.de>

-- 
Regards/Gruss,
    Boris.

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--