tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
kvm: x86: use a uapi-friendly macro for GENMASK
Change uapi header uses of GENMASK to instead use the uapi/linux/bits.h bit
macros, since GENMASK is not defined in uapi headers.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+9
-8
+4
-4
arch/arm64/include/uapi/asm/kvm.h
+4
-4
arch/arm64/include/uapi/asm/kvm.h
···
76
76
77
77
/* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */
78
78
#define KVM_ARM_DEVICE_TYPE_SHIFT 0
79
-
#define KVM_ARM_DEVICE_TYPE_MASK GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \
80
-
KVM_ARM_DEVICE_TYPE_SHIFT)
79
+
#define KVM_ARM_DEVICE_TYPE_MASK __GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \
80
+
KVM_ARM_DEVICE_TYPE_SHIFT)
81
81
#define KVM_ARM_DEVICE_ID_SHIFT 16
82
-
#define KVM_ARM_DEVICE_ID_MASK GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \
83
-
KVM_ARM_DEVICE_ID_SHIFT)
82
+
#define KVM_ARM_DEVICE_ID_MASK __GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \
83
+
KVM_ARM_DEVICE_ID_SHIFT)
84
84
85
85
/* Supported device IDs */
86
86
#define KVM_ARM_DEVICE_VGIC_V2 0
+4
-3
arch/x86/include/uapi/asm/kvm.h
+4
-3
arch/x86/include/uapi/asm/kvm.h
···
8
8
*/
9
9
10
10
#include <linux/const.h>
11
+
#include <linux/bits.h>
11
12
#include <linux/types.h>
12
13
#include <linux/ioctl.h>
13
14
#include <linux/stddef.h>
···
551
550
((__u64)(!!(exclude)) << 55))
552
551
553
552
#define KVM_PMU_MASKED_ENTRY_EVENT_SELECT \
554
-
(GENMASK_ULL(7, 0) | GENMASK_ULL(35, 32))
555
-
#define KVM_PMU_MASKED_ENTRY_UMASK_MASK (GENMASK_ULL(63, 56))
556
-
#define KVM_PMU_MASKED_ENTRY_UMASK_MATCH (GENMASK_ULL(15, 8))
553
+
(__GENMASK_ULL(7, 0) | __GENMASK_ULL(35, 32))
554
+
#define KVM_PMU_MASKED_ENTRY_UMASK_MASK (__GENMASK_ULL(63, 56))
555
+
#define KVM_PMU_MASKED_ENTRY_UMASK_MATCH (__GENMASK_ULL(15, 8))
557
556
#define KVM_PMU_MASKED_ENTRY_EXCLUDE (_BITULL(55))
558
557
#define KVM_PMU_MASKED_ENTRY_UMASK_MASK_SHIFT (56)
559
558
+1
-1
arch/x86/include/uapi/asm/kvm_para.h
+1
-1
arch/x86/include/uapi/asm/kvm_para.h