Commit e4f35891 authored Dec 11, 2018 by WANG Chao Committed by Borislav Petkov Jan 09, 2019

x86, modpost: Replace last remnants of RETPOLINE with CONFIG_RETPOLINE



Commit

  4cd24de3 ("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: 4cd24de3 ("x86/retpoline: Make CONFIG_RETPOLINE depend on compiler support")
Signed-off-by: WANG Chao <chao.wang@ucloud.cn>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Zhenzhong Duan <zhenzhong.duan@oracle.com>
Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Woodhouse <dwmw@amazon.co.uk>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Jessica Yu <jeyu@kernel.org>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Kees Cook <keescook@chromium.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Cc: Michal Marek <michal.lkml@markovi.net>
Cc: Miguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Tim Chen <tim.c.chen@linux.intel.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: linux-kbuild@vger.kernel.org
Cc: srinivas.eeda@oracle.com
Cc: stable <stable@vger.kernel.org>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20181210163725.95977-1-chao.wang@ucloud.cn

parent 90802938

arch/x86/kernel/cpu/bugs.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -215,7 +215,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)

include/linux/compiler-gcc.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@
		*/
		#define uninitialized_var(x) x = x

		#ifdef RETPOLINE
		#ifdef CONFIG_RETPOLINE
		#define __noretpoline __attribute__((__indirect_branch__("keep")))
		#endif

include/linux/module.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -828,7 +828,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)

scripts/mod/modpost.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2185,7 +2185,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");
		}

Admin message