diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-08-04 13:59:56 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-08-04 13:59:56 +0200 |
| commit | 6f49b2f3414622d3e41135a65dac98968956662b (patch) | |
| tree | efd4c358a40b9e6adb9dd35de3407bbf17bd2935 /include/uapi | |
| parent | x86: vdso: use __pvclock_read_cycles (diff) | |
| parent | arm64: KVM: Set cpsr before spsr on fault injection (diff) | |
| download | linux-6f49b2f3414622d3e41135a65dac98968956662b.tar.xz linux-6f49b2f3414622d3e41135a65dac98968956662b.zip | |
Merge tag 'kvm-arm-for-4.8-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/ARM Changes for v4.8 - Take 2
Includes GSI routing support to go along with the new VGIC and a small fix that
has been cooking in -next for a while.
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/kvm.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index e98bb4cce639..300ef255d1e0 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -882,7 +882,10 @@ struct kvm_irq_routing_msi { __u32 address_lo; __u32 address_hi; __u32 data; - __u32 pad; + union { + __u32 pad; + __u32 devid; + }; }; struct kvm_irq_routing_s390_adapter { |