To pick the changes in: da142f3d373a6dda ("KVM: Remove subtle "struct kvm_stats_desc" pseudo-overlay") That just rebuilds perf, as these patches don't add any new KVM ioctl to be harvested for the 'perf trace' ioctl syscall argument beautifiers. This addresses this perf build warning: Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/kvm.h include/uapi/linux/kvm.h Please see tools/include/uapi/README for further details.
Showing the changes to tools/include/uapi/linux (1 of 1 file). Show all
Unified · Split
| @@ -14,6 +14,10 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/ioctl.h> |
| 15 | 15 | #include <asm/kvm.h> |
| 16 | 16 | |
| 17 | +#ifdef __KERNEL__ | |
| 18 | +#include <linux/kvm_types.h> | |
| 19 | +#endif | |
| 20 | + | |
| 17 | 21 | #define KVM_API_VERSION 12 |
| 18 | 22 | |
| 19 | 23 | /* |
| @@ -1601,7 +1605,11 @@ struct kvm_stats_desc { · 1581 unmodified lines | ||
| 1601 | 1605 | __u16 size; |
| 1602 | 1606 | __u32 offset; |
| 1603 | 1607 | __u32 bucket_size; |
| 1608 | +#ifdef __KERNEL__ | |
| 1609 | + char name[KVM_STATS_NAME_SIZE]; | |
| 1610 | +#else | |
| 1604 | 1611 | char name[]; |
| 1612 | +#endif | |
| 1605 | 1613 | }; |
| 1606 | 1614 | |
| 1607 | 1615 | #define KVM_GET_STATS_FD _IO(KVMIO, 0xce) |