Skip to content

Commit e98e886

Browse files
committed
Merge tag 'x86-misc-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 uapi fixlet from Ingo Molnar: "Fix the <uapi/asm/hwcap2.h> UAPI header to build in user-space too" * tag 'x86-misc-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/elf: Use _BITUL() macro in UAPI headers
2 parents 8e4d7a7 + d06aca9 commit e98e886

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

arch/x86/include/uapi/asm/hwcap2.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
#ifndef _ASM_X86_HWCAP2_H
33
#define _ASM_X86_HWCAP2_H
44

5+
#include <linux/const.h>
6+
57
/* MONITOR/MWAIT enabled in Ring 3 */
6-
#define HWCAP2_RING3MWAIT (1 << 0)
8+
#define HWCAP2_RING3MWAIT _BITUL(0)
79

810
/* Kernel allows FSGSBASE instructions available in Ring 3 */
9-
#define HWCAP2_FSGSBASE BIT(1)
11+
#define HWCAP2_FSGSBASE _BITUL(1)
1012

1113
#endif

0 commit comments

Comments
 (0)