Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

s390/nospec: rename assembler generated expoline thunks

The assembler version of the expoline thunk use the naming
__s390x_indirect_jump_rxuse_ry while the compiler generates names
like __s390_indirect_jump_rx_use_ry. Make the naming more consistent.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

+5 -5
+5 -5
arch/s390/include/asm/nospec-insn.h
··· 32 32 .endm 33 33 34 34 .macro __THUNK_PROLOG_BR r1,r2 35 - __THUNK_PROLOG_NAME __s390x_indirect_jump_r\r2\()use_r\r1 35 + __THUNK_PROLOG_NAME __s390_indirect_jump_r\r2\()use_r\r1 36 36 .endm 37 37 38 38 .macro __THUNK_PROLOG_BC d0,r1,r2 39 - __THUNK_PROLOG_NAME __s390x_indirect_branch_\d0\()_\r2\()use_\r1 39 + __THUNK_PROLOG_NAME __s390_indirect_branch_\d0\()_\r2\()use_\r1 40 40 .endm 41 41 42 42 .macro __THUNK_BR r1,r2 43 - jg __s390x_indirect_jump_r\r2\()use_r\r1 43 + jg __s390_indirect_jump_r\r2\()use_r\r1 44 44 .endm 45 45 46 46 .macro __THUNK_BC d0,r1,r2 47 - jg __s390x_indirect_branch_\d0\()_\r2\()use_\r1 47 + jg __s390_indirect_branch_\d0\()_\r2\()use_\r1 48 48 .endm 49 49 50 50 .macro __THUNK_BRASL r1,r2,r3 51 - brasl \r1,__s390x_indirect_jump_r\r3\()use_r\r2 51 + brasl \r1,__s390_indirect_jump_r\r3\()use_r\r2 52 52 .endm 53 53 54 54 .macro __DECODE_RR expand,reg,ruse