Skip to content

Commit dbcfe5e

Browse files
committed
tools kvm headers arm64: Update KVM header from the kernel sources
To pick the changes from: ae3b1da ("KVM: arm64: Fix compile error due to sign extension") That doesn't result in any changes in tooling (when built on x86), only addresses this perf build warning: Warning: Kernel ABI header at 'tools/arch/arm64/include/uapi/asm/kvm.h' differs from latest version at 'arch/arm64/include/uapi/asm/kvm.h' diff -u tools/arch/arm64/include/uapi/asm/kvm.h arch/arm64/include/uapi/asm/kvm.h Cc: Adrian Hunter <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Marc Zyngier <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Yang Yingliang <[email protected]> Link: https://lore.kernel.org/all/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent bc9e7fe commit dbcfe5e

File tree

1 file changed

+4
-2
lines changed
  • tools/arch/arm64/include/uapi/asm

1 file changed

+4
-2
lines changed

tools/arch/arm64/include/uapi/asm/kvm.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ struct kvm_regs {
7575

7676
/* KVM_ARM_SET_DEVICE_ADDR ioctl id encoding */
7777
#define KVM_ARM_DEVICE_TYPE_SHIFT 0
78-
#define KVM_ARM_DEVICE_TYPE_MASK (0xffff << KVM_ARM_DEVICE_TYPE_SHIFT)
78+
#define KVM_ARM_DEVICE_TYPE_MASK GENMASK(KVM_ARM_DEVICE_TYPE_SHIFT + 15, \
79+
KVM_ARM_DEVICE_TYPE_SHIFT)
7980
#define KVM_ARM_DEVICE_ID_SHIFT 16
80-
#define KVM_ARM_DEVICE_ID_MASK (0xffff << KVM_ARM_DEVICE_ID_SHIFT)
81+
#define KVM_ARM_DEVICE_ID_MASK GENMASK(KVM_ARM_DEVICE_ID_SHIFT + 15, \
82+
KVM_ARM_DEVICE_ID_SHIFT)
8183

8284
/* Supported device IDs */
8385
#define KVM_ARM_DEVICE_VGIC_V2 0

0 commit comments

Comments
 (0)