diff options
| author | Thomas Gleixner <tglx@kernel.org> | 2026-04-11 07:58:33 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@kernel.org> | 2026-04-11 07:58:33 +0200 |
| commit | ff1c0c5d07028a84837950b619d30da623f8ddb2 (patch) | |
| tree | 0dac4e0728613580a935876b3b5ba7ba29f51865 /tools/include/uapi/linux | |
| parent | 09c04714cb455debc1dcc3535b6becb52c5b01e0 (diff) | |
| parent | d6e152d905bdb1f32f9d99775e2f453350399a6a (diff) | |
Merge branch 'timers/urgent' into timers/core
to resolve the conflict with urgent fixes.
Diffstat (limited to 'tools/include/uapi/linux')
| -rw-r--r-- | tools/include/uapi/linux/kvm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/include/uapi/linux/kvm.h b/tools/include/uapi/linux/kvm.h index 65500f5db379..80364d4dbebb 100644 --- a/tools/include/uapi/linux/kvm.h +++ b/tools/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) |