From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from userp2130.oracle.com ([156.151.31.86]:37352 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726317AbeLLIPR (ORCPT ); Wed, 12 Dec 2018 03:15:17 -0500 Subject: Re: [PATCH] treewide: replace RETPOLINE with CONFIG_RETPOLINE To: WANG Chao , linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Peter Zijlstra , Thomas Gleixner , David Woodhouse , Borislav Petkov , Daniel Borkmann , "H . Peter Anvin" , Konrad Rzeszutek Wilk , Andy Lutomirski , Masahiro Yamada , Michal Marek , srinivas.eeda@oracle.com References: <20181210163725.95977-1-chao.wang@ucloud.cn> From: Zhenzhong Duan Message-ID: Date: Wed, 12 Dec 2018 16:14:05 +0800 MIME-Version: 1.0 In-Reply-To: <20181210163725.95977-1-chao.wang@ucloud.cn> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: stable-owner@vger.kernel.org List-ID: On 2018/12/11 0:37, WANG Chao wrote: > Since commit 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend > on compiler support"), RETPOLINE has been replaced by CONFIG_RETPOLINE. > > Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support") > Signed-off-by: WANG Chao > --- > arch/x86/kernel/cpu/bugs.c | 2 +- > include/linux/compiler-gcc.h | 2 +- > include/linux/module.h | 2 +- > scripts/mod/modpost.c | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c > index 500278f5308e..e8abe3f6c10e 100644 > --- a/arch/x86/kernel/cpu/bugs.c > +++ b/arch/x86/kernel/cpu/bugs.c > @@ -213,7 +213,7 @@ static enum spectre_v2_mitigation spectre_v2_enabled __ro_after_init = > static enum spectre_v2_user_mitigation spectre_v2_user __ro_after_init = > SPECTRE_V2_USER_NONE; > > -#ifdef RETPOLINE > +#ifdef CONFIG_RETPOLINE > static bool spectre_v2_bad_module; > > bool retpoline_module_ok(bool has_retpoline) > diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h > index 2010493e1040..977ddf2774f9 100644 > --- a/include/linux/compiler-gcc.h > +++ b/include/linux/compiler-gcc.h > @@ -68,7 +68,7 @@ > */ > #define uninitialized_var(x) x = x > > -#ifdef RETPOLINE > +#ifdef CONFIG_RETPOLINE > #define __noretpoline __attribute__((__indirect_branch__("keep"))) > #endif > > diff --git a/include/linux/module.h b/include/linux/module.h > index fce6b4335e36..0c575f51fe57 100644 > --- a/include/linux/module.h > +++ b/include/linux/module.h > @@ -817,7 +817,7 @@ static inline void module_bug_finalize(const Elf_Ehdr *hdr, > static inline void module_bug_cleanup(struct module *mod) {} > #endif /* CONFIG_GENERIC_BUG */ > > -#ifdef RETPOLINE > +#ifdef CONFIG_RETPOLINE > extern bool retpoline_module_ok(bool has_retpoline); > #else > static inline bool retpoline_module_ok(bool has_retpoline) > diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c > index 0d998c54564d..5a5b3780456f 100644 > --- a/scripts/mod/modpost.c > +++ b/scripts/mod/modpost.c > @@ -2157,7 +2157,7 @@ static void add_intree_flag(struct buffer *b, int is_intree) > /* Cannot check for assembler */ > static void add_retpoline(struct buffer *b) > { > - buf_printf(b, "\n#ifdef RETPOLINE\n"); > + buf_printf(b, "\n#ifdef CONFIG_RETPOLINE\n"); > buf_printf(b, "MODULE_INFO(retpoline, \"Y\");\n"); > buf_printf(b, "#endif\n"); > } I have no idea why I have missed these chunks. Thank you for fixing. Reviewed-by: Zhenzhong Duan