Commit 6fda8a38 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

x86/retpoline: Move the retpoline thunk declarations to nospec-branch.h 



Because it makes no sense to split the retpoline gunk over multiple
headers.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Tested-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/r/20211026120310.106290934@infradead.org
parent b6d3d994

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

+0 −8
Original line number Diff line number Diff line
@@ -17,11 +17,3 @@ 
extern void cmpxchg8b_emu(void);

#endif

#ifdef CONFIG_RETPOLINE



#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/include/asm/nospec-branch.h

+7 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <linux/static_key.h>

#include <linux/objtool.h>

#include <linux/linkage.h>



#include <asm/alternative.h>

#include <asm/cpufeatures.h>
@@ -118,6 +119,12 @@ 
	".popsection\n\t"



#ifdef CONFIG_RETPOLINE



#define GEN(reg) \

	extern asmlinkage void __x86_indirect_thunk_ ## reg (void);

#include <asm/GEN-for-each-reg.h>

#undef GEN



#ifdef CONFIG_X86_64



/*

arch/x86/net/bpf_jit_comp.c

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <asm/set_memory.h>

#include <asm/nospec-branch.h>

#include <asm/text-patching.h>

#include <asm/asm-prototypes.h>



static u8 *emit_code(u8 *ptr, u32 bytes, unsigned int len)

{