diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-28 13:16:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-28 13:16:44 -0700 |
| commit | e98e8864b0b553389bbb7d2ed197729a434ba0f0 (patch) | |
| tree | 8a64ddca1d517f548df577cae856c73ffe536569 | |
| parent | 8e4d7a78f08a788a839bd88a2710ba7a71a86e24 (diff) | |
| parent | d06aca989c243dd9e5d3e20aa4e5c2ecfdd07050 (diff) | |
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
| -rw-r--r-- | arch/x86/include/uapi/asm/hwcap2.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/uapi/asm/hwcap2.h b/arch/x86/include/uapi/asm/hwcap2.h index 5fdfcb47000f..054604aba9f0 100644 --- a/arch/x86/include/uapi/asm/hwcap2.h +++ b/arch/x86/include/uapi/asm/hwcap2.h @@ -2,10 +2,12 @@ #ifndef _ASM_X86_HWCAP2_H #define _ASM_X86_HWCAP2_H +#include <linux/const.h> + /* MONITOR/MWAIT enabled in Ring 3 */ -#define HWCAP2_RING3MWAIT (1 << 0) +#define HWCAP2_RING3MWAIT _BITUL(0) /* Kernel allows FSGSBASE instructions available in Ring 3 */ -#define HWCAP2_FSGSBASE BIT(1) +#define HWCAP2_FSGSBASE _BITUL(1) #endif |