mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 05:31:37 -04:00
BackMerge tag 'v7.0-rc4' into drm-next
Linux 7.0-rc4 Needed for rust tree. Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user