diff options
| author | Vladimir Murzin <vladimir.murzin@arm.com> | 2016-09-12 10:49:17 -0400 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2016-09-22 07:21:46 -0400 |
| commit | 19f0ece4395470b24826fc090de2795ecc9cf4a0 (patch) | |
| tree | ec62fc662e145c0d904757d61c6b9ca139b94da3 | |
| parent | b5525ce898eb5cbbd0359d745e23a5516377fa64 (diff) | |
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 <vladimir.murzin@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
| -rw-r--r-- | arch/arm64/kvm/hyp/Makefile | 2 | ||||
| -rw-r--r-- | virt/kvm/arm/hyp/vgic-v3-sr.c (renamed from arch/arm64/kvm/hyp/vgic-v3-sr.c) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile index 0c85febcc1eb..aaf42ae8d8c3 100644 --- a/arch/arm64/kvm/hyp/Makefile +++ b/arch/arm64/kvm/hyp/Makefile | |||
| @@ -5,9 +5,9 @@ | |||
| 5 | KVM=../../../../virt/kvm | 5 | KVM=../../../../virt/kvm |
| 6 | 6 | ||
| 7 | obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o | 7 | obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o |
| 8 | obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o | ||
| 8 | obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o | 9 | obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o |
| 9 | 10 | ||
| 10 | obj-$(CONFIG_KVM_ARM_HOST) += vgic-v3-sr.o | ||
| 11 | obj-$(CONFIG_KVM_ARM_HOST) += sysreg-sr.o | 11 | obj-$(CONFIG_KVM_ARM_HOST) += sysreg-sr.o |
| 12 | obj-$(CONFIG_KVM_ARM_HOST) += debug-sr.o | 12 | obj-$(CONFIG_KVM_ARM_HOST) += debug-sr.o |
| 13 | obj-$(CONFIG_KVM_ARM_HOST) += entry.o | 13 | obj-$(CONFIG_KVM_ARM_HOST) += entry.o |
diff --git a/arch/arm64/kvm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c index 3947095cc0a1..3947095cc0a1 100644 --- a/arch/arm64/kvm/hyp/vgic-v3-sr.c +++ b/virt/kvm/arm/hyp/vgic-v3-sr.c | |||