summaryrefslogtreecommitdiffstats
path: root/include/kvm
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2017-06-15 09:35:15 +0100
committerMarc Zyngier <marc.zyngier@arm.com>2017-06-15 09:35:15 +0100
commit6f2f10cabe73944488a62df16695c86e20d4c3f9 (patch)
tree514fa4c6127892ed55d5a00611ce95555c3ce011 /include/kvm
parentebb127f2d6f32665643165289151bd20929d9931 (diff)
parent33b5c38852b29736f3b472dd095c9a18ec22746f (diff)
downloadlinux-6f2f10cabe73944488a62df16695c86e20d4c3f9.tar.gz
linux-6f2f10cabe73944488a62df16695c86e20d4c3f9.tar.bz2
linux-6f2f10cabe73944488a62df16695c86e20d4c3f9.zip
Merge branch 'kvmarm-master/master' into HEAD
Diffstat (limited to 'include/kvm')
-rw-r--r--include/kvm/arm_vgic.h5
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 */