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@xxxxxxxxxx>
> AuthorDate: Fri, 1 Apr 2016 09:00:35 +0200
> Committer: Ingo Molnar <mingo@xxxxxxxxxx>
> 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@xxxxxxxxx>
> Cc: David Kershner <david.kershner@xxxxxxxxxx>
> Cc: Borislav Petkov <bp@xxxxxxx>
> Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Cc: sparmaintainer@xxxxxxxxxx
> Cc: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
> Link: http://lkml.kernel.org/r/1459266123-21878-3-git-send-email-bp@xxxxxxxxx
> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
> ---
> 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@xxxxxxx>
--
Regards/Gruss,
Boris.
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|