summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-06-28 23:16:44 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-06-28 23:16:44 +0300
commite98e8864b0b553389bbb7d2ed197729a434ba0f0 (patch)
tree8a64ddca1d517f548df577cae856c73ffe536569 /arch
parent8e4d7a78f08a788a839bd88a2710ba7a71a86e24 (diff)
parentd06aca989c243dd9e5d3e20aa4e5c2ecfdd07050 (diff)
downloadlinux-e98e8864b0b553389bbb7d2ed197729a434ba0f0.tar.xz
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
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/include/uapi/asm/hwcap2.h6
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