arm64: mte: remove an ISB on kernel exit
This ISB is unnecessary because we will soon do an ERET. Signed-off-by: Peter 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: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
parent
42e85f9017
commit
b614231dec
1 changed files with 1 additions and 1 deletions
|
@ -182,7 +182,6 @@ alternative_else_nop_endif
|
||||||
mrs_s \tmp2, SYS_GCR_EL1
|
mrs_s \tmp2, SYS_GCR_EL1
|
||||||
bfi \tmp2, \tmp, #0, #16
|
bfi \tmp2, \tmp, #0, #16
|
||||||
msr_s SYS_GCR_EL1, \tmp2
|
msr_s SYS_GCR_EL1, \tmp2
|
||||||
isb
|
|
||||||
#endif
|
#endif
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
|
@ -194,6 +193,7 @@ alternative_else_nop_endif
|
||||||
ldr_l \tmp, gcr_kernel_excl
|
ldr_l \tmp, gcr_kernel_excl
|
||||||
|
|
||||||
mte_set_gcr \tmp, \tmp2
|
mte_set_gcr \tmp, \tmp2
|
||||||
|
isb
|
||||||
1:
|
1:
|
||||||
#endif
|
#endif
|
||||||
.endm
|
.endm
|
||||||
|
|
Loading…
Add table
Reference in a new issue