diff options
| author | Andre Przywara <andre.przywara@arm.com> | 2016-03-16 15:06:41 +0000 |
|---|---|---|
| committer | Christoffer Dall <christoffer.dall@linaro.org> | 2016-05-20 15:40:09 +0200 |
| commit | efffe55af5e16f7935aa0175cf25c386f08219f5 (patch) | |
| tree | d0ce41aa0e3924f3a6130faf0a2613c937d45441 /virt | |
| parent | 568e8c901eaa62004640cad8b9773819f27461a0 (diff) | |
| download | op-kernel-dev-efffe55af5e16f7935aa0175cf25c386f08219f5.zip op-kernel-dev-efffe55af5e16f7935aa0175cf25c386f08219f5.tar.gz | |
KVM: arm/arm64: vgic-new: enable build
Now that the new VGIC implementation has reached feature parity with
the old one, add the new files to the build system and add a Kconfig
option to switch between the two versions.
We set the default to the new version to get maximum test coverage,
in case people experience problems they can switch back to the old
behaviour if needed.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/hyp/vgic-v2-sr.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/virt/kvm/arm/hyp/vgic-v2-sr.c b/virt/kvm/arm/hyp/vgic-v2-sr.c index caac41f..a3f12b3 100644 --- a/virt/kvm/arm/hyp/vgic-v2-sr.c +++ b/virt/kvm/arm/hyp/vgic-v2-sr.c @@ -21,7 +21,12 @@ #include <asm/kvm_hyp.h> +#ifdef CONFIG_KVM_NEW_VGIC +extern struct vgic_global kvm_vgic_global_state; +#define vgic_v2_params kvm_vgic_global_state +#else extern struct vgic_params vgic_v2_params; +#endif static void __hyp_text save_maint_int_state(struct kvm_vcpu *vcpu, void __iomem *base) |
