diff options
author | Radim Krčmář <rkrcmar@redhat.com> | 2017-12-06 15:55:44 +0100 |
---|---|---|
committer | Radim Krčmář <rkrcmar@redhat.com> | 2017-12-06 15:55:44 +0100 |
commit | d29899a30f987de46bcdab3ca4513de2479629e5 (patch) | |
tree | 58869cb489ae91c13b77f2b4ff93fda835fd1405 /include/uapi | |
parent | 2895db67b01cb875457c9c3f30a14723b6b5dfd5 (diff) | |
parent | ca76ec9ca871e67d8cd0b6caba24aca3d3ac4546 (diff) | |
download | linux-d29899a30f987de46bcdab3ca4513de2479629e5.tar.gz linux-d29899a30f987de46bcdab3ca4513de2479629e5.tar.bz2 linux-d29899a30f987de46bcdab3ca4513de2479629e5.zip |
Merge tag 'kvm-s390-master-4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux
KVM: s390: Fixes for 4.15
- SPDX tags
- Fence storage key accesses from problem state
- Make sure that irq_state.flags is not used in the future
Diffstat (limited to 'include/uapi')
-rw-r--r-- | include/uapi/linux/kvm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 282d7613fce8..496e59a2738b 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -630,9 +630,9 @@ struct kvm_s390_irq { struct kvm_s390_irq_state { __u64 buf; - __u32 flags; + __u32 flags; /* will stay unused for compatibility reasons */ __u32 len; - __u32 reserved[4]; + __u32 reserved[4]; /* will stay unused for compatibility reasons */ }; /* for KVM_SET_GUEST_DEBUG */ |