diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2017-04-03 20:38:04 +0200 |
|---|---|---|
| committer | Christoffer Dall <cdall@linaro.org> | 2017-04-09 16:49:34 +0200 |
| commit | 0b51c547fdb7ee05b6d65471785a1d899c8a667c (patch) | |
| tree | 4174536093de2937f730e4a4ad0f92454b911460 /arch/arm64/kvm | |
| parent | ARM: hyp-stub/KVM: Kill __hyp_get_vectors (diff) | |
| download | linux-0b51c547fdb7ee05b6d65471785a1d899c8a667c.tar.xz linux-0b51c547fdb7ee05b6d65471785a1d899c8a667c.zip | |
arm64: hyp-stub/KVM: Kill __hyp_get_vectors
Nobody is using __hyp_get_vectors anymore, so let's remove both
implementations (hyp-stub and KVM).
Acked-by: Catalin Marinas <catalin.marinas@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')
| -rw-r--r-- | arch/arm64/kvm/hyp-init.S | 7 | ||||
| -rw-r--r-- | arch/arm64/kvm/hyp.S | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm64/kvm/hyp-init.S b/arch/arm64/kvm/hyp-init.S index 0ad34fd6d2fc..3734e6315cd7 100644 --- a/arch/arm64/kvm/hyp-init.S +++ b/arch/arm64/kvm/hyp-init.S @@ -124,12 +124,7 @@ __do_hyp_init: ENDPROC(__kvm_hyp_init) ENTRY(__kvm_handle_stub_hvc) - cmp x0, #HVC_GET_VECTORS - b.ne 1f - mrs x0, vbar_el2 - b exit - -1: cmp x0, #HVC_SOFT_RESTART + cmp x0, #HVC_SOFT_RESTART b.ne 1f /* This is where we're about to jump, staying at EL2 */ diff --git a/arch/arm64/kvm/hyp.S b/arch/arm64/kvm/hyp.S index f6f20b58d65a..952f6cb9cf72 100644 --- a/arch/arm64/kvm/hyp.S +++ b/arch/arm64/kvm/hyp.S @@ -36,7 +36,7 @@ * passed in x0. * * A function pointer with a value less than 0xfff has a special meaning, - * and is used to implement __hyp_get_vectors in the same way as in + * and is used to implement hyp stubs in the same way as in * arch/arm64/kernel/hyp_stub.S. */ ENTRY(__kvm_call_hyp) |