Commit b614231d authored by Peter Collingbourne's avatar Peter Collingbourne Committed by Catalin Marinas
Browse files

arm64: mte: remove an ISB on kernel exit 



This ISB is unnecessary because we will soon do an ERET.

Signed-off-by: default avatarPeter Collingbourne <pcc@google.com>
Link: https://linux-review.googlesource.com/id/I69f1ee6bb09b1372dd744a0e01cedaf090c8d448
Link: https://lore.kernel.org/r/20201203073458.2675400-1-pcc@google.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 42e85f90

arch/arm64/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ alternative_else_nop_endif 
	mrs_s	\tmp2, SYS_GCR_EL1

	bfi	\tmp2, \tmp, #0, #16

	msr_s	SYS_GCR_EL1, \tmp2

	isb

#endif

	.endm
@@ -194,6 +193,7 @@ alternative_else_nop_endif 
	ldr_l	\tmp, gcr_kernel_excl



	mte_set_gcr \tmp, \tmp2

	isb

1:

#endif

	.endm