Merge branch 'kvm-arm64/nvhe-wxn' into kvmarm-master/next

Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --cc arch/arm64/include/asm/sysreg.h
Simple merge

diff --cc arch/arm64/kvm/hyp/nvhe/hyp-init.S
index c164045,2e16b20..c953fb4
--- 1/arch/arm64/kvm/hyp/nvhe/hyp-init.S
--- 2/arch/arm64/kvm/hyp/nvhe/hyp-init.S
+++ b/arch/arm64/kvm/hyp/nvhe/hyp-init.S
@@@ -119,16 -115,9 +119,10 @@@ alternative_else_nop_endi
  
        /* Invalidate the stale TLBs from Bootloader */
        tlbi    alle2
 +      tlbi    vmalls12e1
        dsb     sy
  
-       /*
-        * Preserve all the RES1 bits while setting the default flags,
-        * as well as the EE bit on BE. Drop the A flag since the compiler
-        * is allowed to generate unaligned accesses.
-        */
-       mov_q   x0, (SCTLR_EL2_RES1 | (SCTLR_ELx_FLAGS & ~SCTLR_ELx_A))
- CPU_BE(       orr     x0, x0, #SCTLR_ELx_EE)
+       mov_q   x0, INIT_SCTLR_EL2_MMU_ON
  alternative_if ARM64_HAS_ADDRESS_AUTH
        mov_q   x1, (SCTLR_ELx_ENIA | SCTLR_ELx_ENIB | \
                     SCTLR_ELx_ENDA | SCTLR_ELx_ENDB)