From: "tip-bot2 for Joe Richey" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Joe Richey <joerichey@google.com>, Borislav Petkov <bp@suse.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/misc] x86/elf: Use _BITUL() macro in UAPI headers
Date: Fri, 21 May 2021 09:25:48 -0000 [thread overview]
Message-ID: <162158914834.29796.12096447780356064169.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210521085849.37676-2-joerichey94@gmail.com>
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@google.com>
AuthorDate: Fri, 21 May 2021 01:58:42 -07:00
Committer: Borislav Petkov <bp@suse.de>
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@google.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210521085849.37676-2-joerichey94@gmail.com
---
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
next prev parent reply other threads:[~2021-05-21 9:26 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 10:43 [PATCH 0/6] Don't use BIT() " Joe Richey
2021-05-20 10:43 ` [PATCH 1/6] x86/elf: " Joe Richey
2021-05-20 10:43 ` [PATCH 2/6] KVM: X86: " Joe Richey
2021-05-20 15:46 ` Sean Christopherson
2021-05-20 10:43 ` [PATCH 3/6] drivers: firmware: psci: " Joe Richey
2021-05-20 10:43 ` [PATCH 4/6] uacce: " Joe Richey
2021-05-20 10:43 ` [PATCH 5/6] media: vicodec: " Joe Richey
2021-05-20 10:43 ` [PATCH 6/6] tools headers UAPI: Sync pkt_sched.h with the kernel sources Joe Richey
2021-05-20 11:07 ` [PATCH 0/6] Don't use BIT() macro in UAPI headers Borislav Petkov
2021-05-20 11:50 ` Joseph Richey
2021-05-20 15:59 ` Borislav Petkov
2021-05-20 15:50 ` Sean Christopherson
2021-05-20 11:11 ` Mark Rutland
2021-05-20 11:40 ` Joseph Richey
2021-05-20 12:09 ` Paolo Bonzini
2021-05-20 15:47 ` Sean Christopherson
2021-05-21 8:58 ` [PATCH v2 0/7] " Joe Richey
2021-05-21 8:58 ` [PATCH v2 1/7] x86/elf: Use _BITUL() " Joe Richey
2021-05-21 9:25 ` tip-bot2 for Joe Richey [this message]
2021-05-21 8:58 ` [PATCH v2 2/7] KVM: X86: " Joe Richey
2021-05-24 12:28 ` Paolo Bonzini
2021-05-21 8:58 ` [PATCH v2 3/7] drivers: firmware: psci: " Joe Richey
2021-05-21 13:25 ` Mark Rutland
2021-05-21 8:58 ` [PATCH v2 4/7] uacce: " Joe Richey
2021-05-21 13:56 ` Zhangfei Gao
2021-05-21 8:58 ` [PATCH v2 5/7] media: vicodec: " Joe Richey
2021-05-21 8:58 ` [PATCH v2 6/7] tools headers UAPI: Sync pkt_sched.h with the kernel sources Joe Richey
2021-05-21 8:58 ` [PATCH v2 7/7] checkpatch: suggest _BITULL() and _BITUL() for UAPI headers Joe Richey
2021-05-21 14:45 ` Joe Perches
2021-05-24 11:46 ` [PATCH 0/6] Don't use BIT() macro in " Christoph Hellwig
2021-05-24 12:29 ` Mark Rutland
2021-05-24 16:34 ` David Laight
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162158914834.29796.12096447780356064169.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=joerichey@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®