diff options
| author |   Marc Zyngier <marc.zyngier@arm.com> | 2017-06-15 09:35:15 +0100 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2017-06-15 09:35:15 +0100 |
| commit | 6f2f10cabe73944488a62df16695c86e20d4c3f9 (patch) | |
| tree | 514fa4c6127892ed55d5a00611ce95555c3ce011 /include/kvm | |
| parent | KVM: arm/arm64: Don't assume initialized vgic when setting PMU IRQ (diff) | |
| parent | arm: KVM: Allow unaligned accesses at HYP (diff) | |
| download | linux-dev-6f2f10cabe73944488a62df16695c86e20d4c3f9.tar.xz linux-dev-6f2f10cabe73944488a62df16695c86e20d4c3f9.zip | |
Merge branch 'kvmarm-master/master' into HEAD
Diffstat (limited to 'include/kvm')
| -rw-r--r-- | include/kvm/arm_vgic.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h index a2ae9d2de21f..2d923a6b2175 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -202,7 +202,10 @@ struct vgic_dist { /* either a GICv2 CPU interface */ gpa_t vgic_cpu_base; /* or a number of GICv3 redistributor regions */ - gpa_t vgic_redist_base; + struct { + gpa_t vgic_redist_base; + gpa_t vgic_redist_free_offset; + }; }; /* distributor enabled */ |