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

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2090231



commit b6d3d994
Author: Peter Zijlstra <peterz@infradead.org>
Date:   Tue, 26 Oct 2021 14:01:39 +0200

    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



Signed-off-by: Waiman Long <longman@redhat.com>

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

@@ -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

@@ -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