arm64: KVM: Move vgic-v3 save/restore to virt/kvm/arm/hyp

So we can reuse the code under arch/arm Signed-off-by: Vladimir Murzin <[email protected]> Acked-by: Marc Zyngier <[email protected]> Signed-off-by: Christoffer Dall <[email protected]>
josf · Sep 22, 2016 · 19f0ece · 19f0ece
1 parent b5525ce
commit 19f0ece
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
@@ -5,9 +5,9 @@
 KVM=../../../../virt/kvm
 
 obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o
+obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o
 obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o
 
-obj-$(CONFIG_KVM_ARM_HOST) += vgic-v3-sr.o
 obj-$(CONFIG_KVM_ARM_HOST) += sysreg-sr.o
 obj-$(CONFIG_KVM_ARM_HOST) += debug-sr.o
 obj-$(CONFIG_KVM_ARM_HOST) += entry.o

diff --git a/arch/arm64/kvm/hyp/vgic-v3-sr.c → virt/kvm/arm/hyp/vgic-v3-sr.c b/arch/arm64/kvm/hyp/vgic-v3-sr.c → virt/kvm/arm/hyp/vgic-v3-sr.c