diff options
| author | Marc Zyngier <maz@kernel.org> | 2021-04-13 15:41:08 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-04-13 15:41:08 +0100 |
| commit | bba8857febb1d0574480bd13a1be0567ac0f0ce9 (patch) | |
| tree | ab84931d77aafbbe55c20621fbe3e134aca84afd /arch/arm64/kernel | |
| parent | 3b7e56be786462423802ff84525b9a12539c5887 (diff) | |
| parent | c8a4b35f5063c256451a3508e9f0b9e6b49debbb (diff) | |
Merge branch 'kvm-arm64/nvhe-wxn' into kvmarm-master/next
Signed-off-by: Marc Zyngier <maz@kernel.org>
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/cpu-reset.S | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm64/kernel/cpu-reset.S b/arch/arm64/kernel/cpu-reset.S index 37721eb6f9a1..d47ff63a5b66 100644 --- a/arch/arm64/kernel/cpu-reset.S +++ b/arch/arm64/kernel/cpu-reset.S @@ -30,10 +30,7 @@ * flat identity mapping. */ SYM_CODE_START(__cpu_soft_restart) - /* Clear sctlr_el1 flags. */ - mrs x12, sctlr_el1 - mov_q x13, SCTLR_ELx_FLAGS - bic x12, x12, x13 + mov_q x12, INIT_SCTLR_EL1_MMU_OFF pre_disable_mmu_workaround /* * either disable EL1&0 translation regime or disable EL2&0 translation |