4.14-stable review patch. If anyone has any objections, please let me know.
------------------ From: WANG Chao <chao.w...@ucloud.cn> commit e4f358916d528d479c3c12bd2fd03f2d5a576380 upstream. Commit 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support") replaced the RETPOLINE define with CONFIG_RETPOLINE checks. Remove the remaining pieces. [ bp: Massage commit message. ] Fixes: 4cd24de3a098 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support") Signed-off-by: WANG Chao <chao.w...@ucloud.cn> Signed-off-by: Borislav Petkov <b...@suse.de> Reviewed-by: Zhenzhong Duan <zhenzhong.d...@oracle.com> Reviewed-by: Masahiro Yamada <yamada.masah...@socionext.com> Cc: "H. Peter Anvin" <h...@zytor.com> Cc: Andi Kleen <a...@linux.intel.com> Cc: Andrew Morton <a...@linux-foundation.org> Cc: Andy Lutomirski <l...@kernel.org> Cc: Arnd Bergmann <a...@arndb.de> Cc: Daniel Borkmann <dan...@iogearbox.net> Cc: David Woodhouse <d...@amazon.co.uk> Cc: Geert Uytterhoeven <ge...@linux-m68k.org> Cc: Jessica Yu <j...@kernel.org> Cc: Jiri Kosina <jkos...@suse.cz> Cc: Kees Cook <keesc...@chromium.org> Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com> Cc: Luc Van Oostenryck <luc.vanoostenr...@gmail.com> Cc: Michal Marek <michal.l...@markovi.net> Cc: Miguel Ojeda <miguel.ojeda.sando...@gmail.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Tim Chen <tim.c.c...@linux.intel.com> Cc: Vasily Gorbik <g...@linux.ibm.com> Cc: linux-kbu...@vger.kernel.org Cc: srinivas.e...@oracle.com Cc: stable <sta...@vger.kernel.org> Cc: x86-ml <x...@kernel.org> Link: https://lkml.kernel.org/r/20181210163725.95977-1-chao.w...@ucloud.cn Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- 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(-) --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -212,7 +212,7 @@ static enum spectre_v2_mitigation spectr 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) --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -108,7 +108,7 @@ #define __weak __attribute__((weak)) #define __alias(symbol) __attribute__((alias(#symbol))) -#ifdef RETPOLINE +#ifdef CONFIG_RETPOLINE #define __noretpoline __attribute__((indirect_branch("keep"))) #endif --- a/include/linux/module.h +++ b/include/linux/module.h @@ -794,7 +794,7 @@ static inline void module_bug_finalize(c 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) --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -2168,7 +2168,7 @@ static void add_intree_flag(struct buffe /* 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"); }