Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40a3abf7 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

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: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 26a374ae

arch/s390/include/asm/nospec-insn.h

+5 −5
Original line number Diff line number Diff line
@@ -32,23 +32,23 @@ _LC_BR_R1 = __LC_BR_R1 
	.endm



	.macro __THUNK_PROLOG_BR r1,r2

	__THUNK_PROLOG_NAME __s390x_indirect_jump_r\r2\()use_r\r1

	__THUNK_PROLOG_NAME __s390_indirect_jump_r\r2\()use_r\r1

	.endm



	.macro __THUNK_PROLOG_BC d0,r1,r2

	__THUNK_PROLOG_NAME __s390x_indirect_branch_\d0\()_\r2\()use_\r1

	__THUNK_PROLOG_NAME __s390_indirect_branch_\d0\()_\r2\()use_\r1

	.endm



	.macro __THUNK_BR r1,r2

	jg	__s390x_indirect_jump_r\r2\()use_r\r1

	jg	__s390_indirect_jump_r\r2\()use_r\r1

	.endm



	.macro __THUNK_BC d0,r1,r2

	jg	__s390x_indirect_branch_\d0\()_\r2\()use_\r1

	jg	__s390_indirect_branch_\d0\()_\r2\()use_\r1

	.endm



	.macro __THUNK_BRASL r1,r2,r3

	brasl	\r1,__s390x_indirect_jump_r\r3\()use_r\r2

	brasl	\r1,__s390_indirect_jump_r\r3\()use_r\r2

	.endm



	.macro	__DECODE_RR expand,reg,ruse