diff options
| author | Radim Krčmář <rkrcmar@redhat.com> | 2017-05-18 15:40:32 +0300 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-05-18 15:40:32 +0300 |
| commit | 55c315ee09d3bd37f9d71e85e54d6ebe675b6462 (patch) | |
| tree | 40ebc216ec3989bd33ac2ce11ba8037a2481f938 /include | |
| parent | b401ee0b85a53e89739ff68a5b1a0667d664afc9 (diff) | |
| parent | fa472fa91a5a0b241f5ddae927d2e235d07545df (diff) | |
| download | linux-55c315ee09d3bd37f9d71e85e54d6ebe675b6462.tar.xz | |
Merge tag 'kvm-arm-for-v4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm
KVM/ARM Fixes for v4.12-rc2.
Includes:
- A fix for a build failure introduced in -rc1 when tracepoints are
enabled on 32-bit ARM.
- Disabling use of stack pointer protection in the hyp code which can
cause panics.
- A handful of VGIC fixes.
- A fix to the init of the redistributors on GICv3 systems that
prevented boot with kvmtool on GICv3 systems introduced in -rc1.
- A number of race conditions fixed in our MMU handling code.
- A fix for the guest being able to program the debug extensions for
the host on the 32-bit side.
Diffstat (limited to 'include')
| -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 97b8d3728b31..ef718586321c 100644 --- a/include/kvm/arm_vgic.h +++ b/include/kvm/arm_vgic.h @@ -195,7 +195,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 */ |