summaryrefslogtreecommitdiff
path: root/arch/arm64/kvm/hyp/Makefile
diff options
context:
space:
mode:
authorDavid Brazdil <dbrazdil@google.com>2020-06-25 14:14:17 +0100
committerMarc Zyngier <maz@kernel.org>2020-07-05 18:38:38 +0100
commit9aebdea494b5d2d5fe0ba54d71e9d6c5acfe76b4 (patch)
tree523b5b8b519681b067f767b820193a9eafdb989a /arch/arm64/kvm/hyp/Makefile
parent13aeb9b400c5d7c5e979fdbbf994c787487f7889 (diff)
KVM: arm64: Duplicate hyp/timer-sr.c for VHE/nVHE
timer-sr.c contains a HVC handler for setting CNTVOFF_EL2 and two helper functions for controlling access to physical counter. The former is used by both VHE/nVHE and is duplicated, the latter are used only by nVHE and moved to nvhe/timer-sr.c. Signed-off-by: David Brazdil <dbrazdil@google.com> Signed-off-by: Marc Zyngier <maz@kernel.org> Link: https://lore.kernel.org/r/20200625131420.71444-13-dbrazdil@google.com
Diffstat (limited to 'arch/arm64/kvm/hyp/Makefile')
-rw-r--r--arch/arm64/kvm/hyp/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
index f49797237818..ef1aa7fe8f5a 100644
--- a/arch/arm64/kvm/hyp/Makefile
+++ b/arch/arm64/kvm/hyp/Makefile
@@ -13,7 +13,7 @@ subdir-ccflags-y := -I$(incdir) \
obj-$(CONFIG_KVM) += hyp.o vhe/ nvhe/
obj-$(CONFIG_KVM_INDIRECT_VECTORS) += smccc_wa.o
-hyp-y := vgic-v3-sr.o timer-sr.o aarch32.o vgic-v2-cpuif-proxy.o entry.o \
+hyp-y := vgic-v3-sr.o aarch32.o vgic-v2-cpuif-proxy.o entry.o \
fpsimd.o
# KVM code is run at a different exception code with a different map, so