From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752392AbbLESvF (ORCPT ); Sat, 5 Dec 2015 13:51:05 -0500 Received: from www.linutronix.de ([62.245.132.108]:53530 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751383AbbLESvE (ORCPT ); Sat, 5 Dec 2015 13:51:04 -0500 Date: Sat, 5 Dec 2015 19:50:11 +0100 (CET) From: Thomas Gleixner To: Borislav Petkov cc: X86 ML , LKML , David Sterba , Herbert Xu , Peter Zijlstra , Matt Mackall , Chris Mason , Josef Bacik Subject: Re: [PATCH 3/4] x86/cpufeature: Remove unused and seldomly used cpu_has_xx macros In-Reply-To: <1448982023-19187-4-git-send-email-bp@alien8.de> Message-ID: References: <1448982023-19187-1-git-send-email-bp@alien8.de> <1448982023-19187-4-git-send-email-bp@alien8.de> User-Agent: Alpine 2.11 (DEB 23 2013-08-11) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 1 Dec 2015, Borislav Petkov wrote: > #if __GNUC__ >= 4 > extern void warn_pre_alternatives(void); > diff --git a/arch/x86/include/asm/xor_32.h b/arch/x86/include/asm/xor_32.h > index 5a08bc8bff33..ccca77dad474 100644 > --- a/arch/x86/include/asm/xor_32.h > +++ b/arch/x86/include/asm/xor_32.h > @@ -553,7 +553,7 @@ do { \ > if (cpu_has_xmm) { \ > xor_speed(&xor_block_pIII_sse); \ > xor_speed(&xor_block_sse_pf64); \ > - } else if (cpu_has_mmx) { \ > + } else if (static_cpu_has_safe(X86_FEATURE_MMX)) { \ This one can be boot_cpu_has. It's only used in crypto init for testing the fastest xor algo. > diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c > index 3b533cf37c74..8f2ef910c7bf 100644 > --- a/arch/x86/kernel/cpu/mtrr/generic.c > +++ b/arch/x86/kernel/cpu/mtrr/generic.c > @@ -349,7 +349,7 @@ static void get_fixed_ranges(mtrr_type *frs) > > void mtrr_save_fixed_ranges(void *info) > { > - if (cpu_has_mtrr) > + if (static_cpu_has_safe(X86_FEATURE_MTRR)) > get_fixed_ranges(mtrr_state.fixed_ranges); This one is not really hotpath either. Its called from cpu_up and from hibernation code. Thanks, tglx