Skip to content

Commit c5a674c

Browse files
pa1guptavijay-suman
authored andcommitted
x86/speculation: Remove the extra #ifdef around CALL_NOSPEC
commit c8c81458863ab686cda4fe1e603fccaae0f12460 upstream. Commit: 010c4a4 ("x86/speculation: Simplify and make CALL_NOSPEC consistent") added an #ifdef CONFIG_RETPOLINE around the CALL_NOSPEC definition. This is not required as this code is already under a larger #ifdef. Remove the extra #ifdef, no functional change. vmlinux size remains same before and after this change: CONFIG_RETPOLINE=y: text data bss dec hex filename 25434752 7342290 2301212 35078254 217406e vmlinux.before 25434752 7342290 2301212 35078254 217406e vmlinux.after # CONFIG_RETPOLINE is not set: text data bss dec hex filename 22943094 6214994 1550152 30708240 1d49210 vmlinux.before 22943094 6214994 1550152 30708240 1d49210 vmlinux.after [ pawan: s/CONFIG_MITIGATION_RETPOLINE/CONFIG_RETPOLINE/ ] Signed-off-by: Pawan Gupta <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Reviewed-by: Josh Poimboeuf <[email protected]> Link: https://lore.kernel.org/r/20250320-call-nospec-extra-ifdef-v1-1-d9b084d24820@linux.intel.com Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 86a34f5eb24c93a0de76f20a59f1928da286ae9b) Signed-off-by: Vijayendra Suman <[email protected]>
1 parent eb98219 commit c5a674c

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

arch/x86/include/asm/nospec-branch.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -305,12 +305,8 @@ extern its_thunk_t __x86_indirect_its_thunk_array[];
305305
* Inline asm uses the %V modifier which is only in newer GCC
306306
* which is ensured when CONFIG_RETPOLINE is defined.
307307
*/
308-
#ifdef CONFIG_RETPOLINE
309308
#define CALL_NOSPEC __CS_PREFIX("%V[thunk_target]") \
310309
"call __x86_indirect_thunk_%V[thunk_target]\n"
311-
#else
312-
#define CALL_NOSPEC "call *%[thunk_target]\n"
313-
#endif
314310

315311
# define THUNK_TARGET(addr) [thunk_target] "r" (addr)
316312

0 commit comments

Comments
 (0)