[tip: x86/misc] x86/elf: Use _BITUL() macro in UAPI headers
From: tip-bot2 for Joe Richey
Date: Fri May 21 2021 - 05:26:19 EST
The following commit has been merged into the x86/misc branch of tip:
Commit-ID: d06aca989c243dd9e5d3e20aa4e5c2ecfdd07050
Gitweb: https://git.kernel.org/tip/d06aca989c243dd9e5d3e20aa4e5c2ecfdd07050
Author: Joe Richey <joerichey@xxxxxxxxxx>
AuthorDate: Fri, 21 May 2021 01:58:42 -07:00
Committer: Borislav Petkov <bp@xxxxxxx>
CommitterDate: Fri, 21 May 2021 11:12:52 +02:00
x86/elf: Use _BITUL() macro in UAPI headers
Replace BIT() in x86's UAPI header with _BITUL(). BIT() is not defined
in the UAPI headers and its usage may cause userspace build errors.
Fixes: 742c45c3ecc9 ("x86/elf: Enumerate kernel FSGSBASE capability in AT_HWCAP2")
Signed-off-by: Joe Richey <joerichey@xxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/20210521085849.37676-2-joerichey94@xxxxxxxxx
---
arch/x86/include/uapi/asm/hwcap2.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/uapi/asm/hwcap2.h b/arch/x86/include/uapi/asm/hwcap2.h
index 5fdfcb4..054604a 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