diff options
| author | Steven Rostedt <rostedt@goodmis.org> | 2026-03-24 22:19:13 -0400 |
|---|---|---|
| committer | Steven Rostedt (Google) <rostedt@goodmis.org> | 2026-03-24 22:19:21 -0400 |
| commit | dc1d9408c961c1c4d4b3b99a1d9390c17e13de71 (patch) | |
| tree | 7c416e2c9fd57a0dda5f69cd3deb19c55f53ec24 /include/uapi | |
| parent | a717943d8ecc0e533c581bf04473b50f6f17f2cb (diff) | |
| parent | f35dbac6942171dc4ce9398d1d216a59224590a9 (diff) | |
| download | lwn-dc1d9408c961c1c4d4b3b99a1d9390c17e13de71.tar.gz lwn-dc1d9408c961c1c4d4b3b99a1d9390c17e13de71.zip | |
Merge commit 'f35dbac6942171dc4ce9398d1d216a59224590a9' into trace/ring-buffer/core
The commit f35dbac69421 ("ring-buffer: Fix to update per-subbuf entries of
persistent ring buffer") was a fix and merged upstream. It is needed for
some other work in the ring buffer. The current branch has the remote
buffer code that is shared with the Arm64 subsystem and can't be rebased.
Merge in the upstream commit to allow continuing of the ring buffer work.
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/kvm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 65500f5db379..80364d4dbebb 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -14,6 +14,10 @@ #include <linux/ioctl.h> #include <asm/kvm.h> +#ifdef __KERNEL__ +#include <linux/kvm_types.h> +#endif + #define KVM_API_VERSION 12 /* @@ -1601,7 +1605,11 @@ struct kvm_stats_desc { __u16 size; __u32 offset; __u32 bucket_size; +#ifdef __KERNEL__ + char name[KVM_STATS_NAME_SIZE]; +#else char name[]; +#endif }; #define KVM_GET_STATS_FD _IO(KVMIO, 0xce) |