Re: [PATCH 06/10] x86/cpufeature: Get rid of the non-asm goto variant

[Brian Gerst]

On Tue, Jan 26, 2016 at 4:12 PM, Borislav Petkov <bp@xxxxxxxxx> wrote:
> From: Borislav Petkov <bp@xxxxxxx>
>
> I can simply quote hpa from the mail:
>
> "Get rid of the non-asm goto variant and just fall back to dynamic if
> asm goto is unavailable. It doesn't make any sense, really, if it is
> supposed to be safe, and by now the asm goto-capable gcc is in more wide
> use. (Originally the gcc 3.x fallback to pure dynamic didn't exist,
> either.)"
>
> Booy, am I lazy.
>
> Cleanup the whole CC_HAVE_ASM_GOTO ifdeffery too, while at it.
>
> Signed-off-by: Borislav Petkov <bp@xxxxxxx>
> Suggested-by: "H. Peter Anvin" <hpa@xxxxxxxxx>
> ---
>  arch/x86/include/asm/cpufeature.h | 49 ++++-----------------------------------
>  1 file changed, 5 insertions(+), 44 deletions(-)
>
> diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
> index a261cf2e7907..d48bf024f335 100644
> --- a/arch/x86/include/asm/cpufeature.h
> +++ b/arch/x86/include/asm/cpufeature.h
> @@ -129,17 +129,16 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
>   * fast paths and boot_cpu_has() otherwise!
>   */
>
> -#if __GNUC__ >= 4 && defined(CONFIG_X86_FAST_FEATURE_TESTS)
> +#if CC_HAVE_ASM_GOTO && defined(CONFIG_X86_FAST_FEATURE_TESTS)

This should be:
#if defined(CC_HAVE_ASM_GOTO) && ...

--
Brian Gerst