* [GIT PULL] x86/misc UAPI fix for v5.14
@ 2021-06-28 7:32 Ingo Molnar
2021-06-28 20:33 ` pr-tracker-bot
0 siblings, 1 reply; 2+ messages in thread
From: Ingo Molnar @ 2021-06-28 7:32 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, Borislav Petkov, Thomas Gleixner, Peter Zijlstra,
Andrew Morton
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [GIT PULL] x86/misc UAPI fix for v5.14
2021-06-28 7:32 [GIT PULL] x86/misc UAPI fix for v5.14 Ingo Molnar
@ 2021-06-28 20:33 ` pr-tracker-bot
0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2021-06-28 20:33 UTC (permalink / raw)
To: Ingo Molnar
Cc: Linus Torvalds, linux-kernel, Borislav Petkov, Thomas Gleixner,
Peter Zijlstra, Andrew Morton
The pull request you sent on Mon, 28 Jun 2021 09:32:39 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-misc-2021-06-28
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/e98e8864b0b553389bbb7d2ed197729a434ba0f0
Thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-28 20:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-28 7:32 [GIT PULL] x86/misc UAPI fix for v5.14 Ingo Molnar
2021-06-28 20:33 ` pr-tracker-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).