diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2017-04-03 21:37:43 +0300 |
|---|---|---|
| committer | Christoffer Dall <cdall@linaro.org> | 2017-04-09 17:49:22 +0300 |
| commit | 4adb1341c7ef68af54732ef11f69faedffa6acb7 (patch) | |
| tree | 7112edec37151cf50a7a1f8639d0d84d3c5a3dff /arch/arm64/kvm/hyp-init.S | |
| parent | 5fbe9a599a30940c10ede35f90eb7014a6c2ed70 (diff) | |
| download | linux-4adb1341c7ef68af54732ef11f69faedffa6acb7.tar.xz | |
arm64: KVM: Convert __cpu_reset_hyp_mode to using __hyp_reset_vectors
We are now able to use the hyp stub to reset HYP mode. Time to
kiss __kvm_hyp_reset goodbye, and use __hyp_reset_vectors.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Reviewed-by: James Morse <james.morse@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <cdall@linaro.org>
Diffstat (limited to 'arch/arm64/kvm/hyp-init.S')
| -rw-r--r-- | arch/arm64/kvm/hyp-init.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp-init.S b/arch/arm64/kvm/hyp-init.S index fded932ede1b..b7a8f12293cc 100644 --- a/arch/arm64/kvm/hyp-init.S +++ b/arch/arm64/kvm/hyp-init.S @@ -134,7 +134,6 @@ ENTRY(__kvm_handle_stub_hvc) /* * Reset kvm back to the hyp stub. */ -ENTRY(__kvm_hyp_reset) /* We're now in idmap, disable MMU */ mrs x0, sctlr_el2 ldr x1, =SCTLR_ELx_FLAGS @@ -152,7 +151,6 @@ ENTRY(__kvm_hyp_reset) exit: eret -ENDPROC(__kvm_hyp_reset) ENDPROC(__kvm_handle_stub_hvc) .ltorg |