[GIT PULL] x86/misc UAPI fix for v5.14

From: Ingo Molnar
Date: Mon Jun 28 2021 - 03:32:45 EST


Linus,

Please pull the latest x86/misc git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-misc-2021-06-28

# HEAD: d06aca989c243dd9e5d3e20aa4e5c2ecfdd07050 x86/elf: Use _BITUL() macro in UAPI headers

Fix the <uapi/asm/hwcap2.h> UAPI header to build in user-space too.

Thanks,

Ingo

------------------>
Joe Richey (1):
x86/elf: Use _BITUL() macro in UAPI headers


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 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