History

BackMerge tag 'v7.0-rc4' into drm-next

Linux 7.0-rc4 Needed for rust tree.

Dave Airlie committed 7 months ago

Commit 13c072b2 parents 74919e2 f338e77513 files · +6174 −3957Browse files

Showing the changes to include/uapi (1 of 513 files). Show all

Unified · Split

include/uapi/linux/kvm.h+8−0
@@ -14,6 +14,10 @@ · 13 unmodified lines
1414 #include <linux/ioctl.h>
1515 #include <asm/kvm.h>
1616
17+#ifdef __KERNEL__
18+#include <linux/kvm_types.h>
19+#endif
20+
1721 #define KVM_API_VERSION 12
1822
1923 /*
@@ -1601,7 +1605,11 @@ struct kvm_stats_desc { · 1581 unmodified lines
16011605 __u16 size;
16021606 __u32 offset;
16031607 __u32 bucket_size;
1608+#ifdef __KERNEL__
1609+ char name[KVM_STATS_NAME_SIZE];
1610+#else
16041611 char name[];
1612+#endif
16051613 };
16061614
16071615 #define KVM_GET_STATS_FD _IO(KVMIO, 0xce)