diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-09-09 06:48:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-09-09 06:48:07 +0200 |
| commit | bdea534db894ea19320f470ce2e63b1d9de96a15 (patch) | |
| tree | 8ec2a0a93d9bb5e7205253c67aa624b9ec227477 /arch/arm64/kvm/hyp-init.S | |
| parent | 39b5a56ec0be5effe9b7d0f18cb27724bf2e5d47 (diff) | |
| parent | 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (diff) | |
| download | linux-bdea534db894ea19320f470ce2e63b1d9de96a15.tar.gz | |
Merge tag 'v3.17-rc4' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm64/kvm/hyp-init.S')
| -rw-r--r-- | arch/arm64/kvm/hyp-init.S | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp-init.S b/arch/arm64/kvm/hyp-init.S index d968796f4b2d..c3191168a994 100644 --- a/arch/arm64/kvm/hyp-init.S +++ b/arch/arm64/kvm/hyp-init.S @@ -80,6 +80,10 @@ __do_hyp_init: msr mair_el2, x4 isb + /* Invalidate the stale TLBs from Bootloader */ + tlbi alle2 + dsb sy + mrs x4, sctlr_el2 and x4, x4, #SCTLR_EL2_EE // preserve endianness of EL2 ldr x5, =SCTLR_EL2_FLAGS |