summaryrefslogtreecommitdiff
path: root/arch/arm/kvm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-04-03 21:38:03 +0300
committerChristoffer Dall <cdall@linaro.org>2017-04-09 17:49:34 +0300
commitecb5d61daaa2fc09235191926ea808e00e2e1c0c (patch)
treefba7688c744a16d507e29c8f7d8b9fa6e9fb77e7 /arch/arm/kvm
parent4897e36c8d37fe508a423d6d15a635aba2557b4e (diff)
downloadlinux-ecb5d61daaa2fc09235191926ea808e00e2e1c0c.tar.xz
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/kvm')
-rw-r--r--arch/arm/kvm/init.S7
-rw-r--r--arch/arm/kvm/interrupts.S4
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/kvm/init.S b/arch/arm/kvm/init.S
index e53360dceb19..87bcd7ae4552 100644
--- a/arch/arm/kvm/init.S
+++ b/arch/arm/kvm/init.S
@@ -122,12 +122,7 @@ __do_hyp_init:
eret
ENTRY(__kvm_handle_stub_hvc)
- cmp r0, #HVC_GET_VECTORS
- bne 1f
- mrc p15, 4, r0, c12, c0, 0 @ get HVBAR
- b exit
-
-1: cmp r0, #HVC_SOFT_RESTART
+ cmp r0, #HVC_SOFT_RESTART
bne 1f
/* The target is expected in r1 */
diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
index b1bd316f14c0..80a1d6cd261c 100644
--- a/arch/arm/kvm/interrupts.S
+++ b/arch/arm/kvm/interrupts.S
@@ -37,10 +37,6 @@
* in Hyp mode (see init_hyp_mode in arch/arm/kvm/arm.c). Return values are
* passed in r0 (strictly 32bit).
*
- * A function pointer with a value of 0xffffffff has a special meaning,
- * and is used to implement __hyp_get_vectors in the same way as in
- * arch/arm/kernel/hyp_stub.S.
- *
* The calling convention follows the standard AAPCS:
* r0 - r3: caller save
* r12: caller save