Skip to content

Commit 4e8f6e4

Browse files
Neeraj Upadhyaywilldeacon
authored andcommitted
arm64: Fix label placement in record_mmu_state()
Fix label so that pre_disable_mmu_workaround() is called before clearing sctlr_el1.M. Fixes: 2ced0f3 ("arm64: head: Switch endianness before populating the ID map") Signed-off-by: Neeraj Upadhyay <quic_neeraju@quicinc.com> Acked-by: Ard Biesheuvel <ardb@kernel.org> Link: https://lore.kernel.org/r/20230425095700.22005-1-quic_neeraju@quicinc.com Signed-off-by: Will Deacon <will@kernel.org>
1 parent eeb3557 commit 4e8f6e4

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

arch/arm64/kernel/head.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ CPU_BE( tbz x19, #SCTLR_ELx_EE_SHIFT, 1f )
150150
pre_disable_mmu_workaround
151151
msr sctlr_el2, x19
152152
b 3f
153-
pre_disable_mmu_workaround
154-
2: msr sctlr_el1, x19
153+
2: pre_disable_mmu_workaround
154+
msr sctlr_el1, x19
155155
3: isb
156156
mov x19, xzr
157157
ret

0 commit comments

Comments
 (0)