arm64: Fix label placement in record_mmu_state()

Fix label so that pre_disable_mmu_workaround() is called
before clearing sctlr_el1.M.

Fixes: 2ced0f30a426 ("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>

diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index b98970907226b36c042b13d56582aede40fe7d7d..e92caebff46a03479c17fbd8001bf9c69789923f 100644 (file)
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -150,8 +150,8 @@ CPU_BE( tbz x19, #SCTLR_ELx_EE_SHIFT, 1f    )
        pre_disable_mmu_workaround
        msr     sctlr_el2, x19
        b       3f
-       pre_disable_mmu_workaround
-2:     msr     sctlr_el1, x19
+2:     pre_disable_mmu_workaround
+       msr     sctlr_el1, x19
 3:     isb
        mov     x19, xzr
        ret