diff options
| author | Marc Zyngier | 2017-04-03 20:38:03 +0200 |
|---|---|---|
| committer | Christoffer Dall | 2017-04-09 16:49:34 +0200 |
| commit | ecb5d61daaa2fc09235191926ea808e00e2e1c0c (patch) | |
| tree | fba7688c744a16d507e29c8f7d8b9fa6e9fb77e7 /arch/arm/kernel | |
| parent | ARM: decompressor: Remove __hyp_get_vectors usage (diff) | |
| download | kernel-qcow2-linux-ecb5d61daaa2fc09235191926ea808e00e2e1c0c.tar.gz kernel-qcow2-linux-ecb5d61daaa2fc09235191926ea808e00e2e1c0c.tar.xz kernel-qcow2-linux-ecb5d61daaa2fc09235191926ea808e00e2e1c0c.zip | |
ARM: 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: Russell King <rmk+kernel@armlinux.org.uk>
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/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/hyp-stub.S | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 675c50f5cb5c..918c64f17128 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -202,12 +202,7 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE ENDPROC(__hyp_stub_install_secondary) __hyp_stub_do_trap: - teq r0, #HVC_GET_VECTORS - bne 1f - mrc p15, 4, r0, c12, c0, 0 @ get HVBAR - b __hyp_stub_exit - -1: teq r0, #HVC_SET_VECTORS + teq r0, #HVC_SET_VECTORS bne 1f mcr p15, 4, r1, c12, c0, 0 @ set HVBAR b __hyp_stub_exit @@ -247,12 +242,6 @@ ENDPROC(__hyp_stub_do_trap) * so you will need to set that to something sensible at the new hypervisor's * initialisation entry point. */ -ENTRY(__hyp_get_vectors) - mov r0, #HVC_GET_VECTORS - __HVC(0) - ret lr -ENDPROC(__hyp_get_vectors) - ENTRY(__hyp_set_vectors) mov r1, r0 mov r0, #HVC_SET_VECTORS |