diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2016-01-28 14:24:39 +0000 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2016-02-29 18:34:18 +0000 |
| commit | 6d50d54cd80cb60d701e70fb0633250115606459 (patch) | |
| tree | 9a63ecd9ac770fc4410200ad205e79bfafab1f46 | |
| parent | 13720a56edbd8164fbfa251067dea9776e09f54b (diff) | |
| download | op-kernel-dev-6d50d54cd80cb60d701e70fb0633250115606459.zip op-kernel-dev-6d50d54cd80cb60d701e70fb0633250115606459.tar.gz | |
arm64: KVM: Move vgic-v2 and timer save/restore to virt/kvm/arm/hyp
We already have virt/kvm/arm/ containing timer and vgic stuff.
Add yet another subdirectory to contain the hyp-specific files
(timer and vgic again).
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
| -rw-r--r-- | arch/arm64/kvm/hyp/Makefile | 7 | ||||
| -rw-r--r-- | virt/kvm/arm/hyp/timer-sr.c (renamed from arch/arm64/kvm/hyp/timer-sr.c) | 0 | ||||
| -rw-r--r-- | virt/kvm/arm/hyp/vgic-v2-sr.c (renamed from arch/arm64/kvm/hyp/vgic-v2-sr.c) | 0 |
3 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index 5326e66..b6a8fc5 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile @@ -2,9 +2,12 @@ # Makefile for Kernel-based Virtual Machine module, HYP part # -obj-$(CONFIG_KVM_ARM_HOST) += vgic-v2-sr.o +KVM=../../../../virt/kvm + +obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-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) += timer-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/timer-sr.c b/virt/kvm/arm/hyp/timer-sr.c index ea00d69..ea00d69 100644 --- a/arch/arm64/kvm/hyp/timer-sr.c +++ b/virt/kvm/arm/hyp/timer-sr.c diff --git a/arch/arm64/kvm/hyp/vgic-v2-sr.c b/virt/kvm/arm/hyp/vgic-v2-sr.c index 9514a7d..9514a7d 100644 --- a/arch/arm64/kvm/hyp/vgic-v2-sr.c +++ b/virt/kvm/arm/hyp/vgic-v2-sr.c |
