diff options
| author | Takashi Iwai <tiwai@suse.de> | 2026-03-27 12:16:52 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2026-03-27 12:16:52 +0300 |
| commit | 50c8f83c41123cab79575e8d73040a37da4612c5 (patch) | |
| tree | c824f90d21d57e668979cad4efb4c59d0003d6b7 /include/uapi | |
| parent | 591721223be9e28f83489a59289579493b8e3d83 (diff) | |
| parent | d40a198e2b7821197c5c77b89d0130cc90f400f5 (diff) | |
| download | linux-50c8f83c41123cab79575e8d73040a37da4612c5.tar.xz | |
Merge tag 'asoc-fix-v7.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v7.0
This is two week's worth of fixes and quirks so it's a bit larger than
you might expect, there's nothing too exciting individually and nothing
in core code.
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) |