diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-15 11:36:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-15 11:36:20 -0800 |
| commit | 3fba36145cc4665792d63668579aa719e1d5e8cb (patch) | |
| tree | e9366384f826ed3eecb7e72fb9516045b6d3c6a0 /tools/include | |
| parent | 35d57884804ca45bfbf7590933066547050f5786 (diff) | |
| parent | 643e345c95f0b4a4082c60755e06e3e635658da6 (diff) | |
| download | talos-obmc-linux-3fba36145cc4665792d63668579aa719e1d5e8cb.tar.gz talos-obmc-linux-3fba36145cc4665792d63668579aa719e1d5e8cb.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf tooling fix from Ingo Molnar:
"Synchronize kernel <-> tooling headers to resolve two build warnings
in the perf build"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tools/headers: Synchronize kernel <-> tooling headers
Diffstat (limited to 'tools/include')
| -rw-r--r-- | tools/include/uapi/linux/kvm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h index 282d7613fce8..496e59a2738b 100644 --- a/tools/include/uapi/linux/kvm.h +++ b/tools/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 */ |
