Commit b6d3d994 authored Oct 26, 2021 by Peter Zijlstra

x86/asm: Fixup odd GEN-for-each-reg.h usage



Currently GEN-for-each-reg.h usage leaves GEN defined, relying on any
subsequent usage to start with #undef, which is rude.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Borislav Petkov <bp@suse.de>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Tested-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/r/20211026120310.041792350@infradead.org

parent a92ede2d

arch/x86/include/asm/asm-prototypes.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,9 +19,9 @@ extern void cmpxchg8b_emu(void);

		#ifdef CONFIG_RETPOLINE

		#undef GEN
		#define GEN(reg) \
		extern asmlinkage void __x86_indirect_thunk_ ## reg (void);
		#include <asm/GEN-for-each-reg.h>
		#undef GEN

		#endif /* CONFIG_RETPOLINE */

arch/x86/lib/retpoline.S

+2 −2

Original line number	Diff line number	Diff line
		@@ -55,10 +55,10 @@ SYM_FUNC_END(__x86_indirect_thunk_\reg)
		#define __EXPORT_THUNK(sym) _ASM_NOKPROBE(sym); EXPORT_SYMBOL(sym)
		#define EXPORT_THUNK(reg) __EXPORT_THUNK(__x86_indirect_thunk_ ## reg)

		#undef GEN
		#define GEN(reg) THUNK reg
		#include <asm/GEN-for-each-reg.h>

		#undef GEN

		#define GEN(reg) EXPORT_THUNK(reg)
		#include <asm/GEN-for-each-reg.h>
		#undef GEN