From: "tip-bot2 for Juergen Gross" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
Juergen Gross <jgross@suse.com>, Ingo Molnar <mingo@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/urgent] x86/static-call: Fix 32-bit build
Date: Wed, 18 Dec 2024 09:43:49 -0000 [thread overview]
Message-ID: <173451502997.7135.15176892215475394042.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20241218080228.9742-1-jgross@suse.com>
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 45dec3ca1fe153cabd79ef8cd05bff64cd2efa52
Gitweb: https://git.kernel.org/tip/45dec3ca1fe153cabd79ef8cd05bff64cd2efa52
Author: Juergen Gross <jgross@suse.com>
AuthorDate: Wed, 18 Dec 2024 09:02:28 +01:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 18 Dec 2024 10:36:43 +01:00
x86/static-call: Fix 32-bit build
In 32-bit x86 builds CONFIG_STATIC_CALL_INLINE isn't set, leading to
static_call_initialized not being available.
Define it as "0" in that case.
Fixes: 0ef8047b737d ("x86/static-call: provide a way to do very early static-call updates")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20241218080228.9742-1-jgross@suse.com
---
include/linux/static_call.h | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/include/linux/static_call.h b/include/linux/static_call.h
index 785980a..78a77a4 100644
--- a/include/linux/static_call.h
+++ b/include/linux/static_call.h
@@ -138,7 +138,6 @@
#ifdef CONFIG_HAVE_STATIC_CALL
#include <asm/static_call.h>
-extern int static_call_initialized;
/*
* Either @site or @tramp can be NULL.
*/
@@ -161,6 +160,8 @@ extern void arch_static_call_transform(void *site, void *tramp, void *func, bool
#ifdef CONFIG_HAVE_STATIC_CALL_INLINE
+extern int static_call_initialized;
+
extern int __init static_call_init(void);
extern void static_call_force_reinit(void);
@@ -226,6 +227,8 @@ extern long __static_call_return0(void);
#elif defined(CONFIG_HAVE_STATIC_CALL)
+#define static_call_initialized 0
+
static inline int static_call_init(void) { return 0; }
#define DEFINE_STATIC_CALL(name, _func) \
@@ -282,6 +285,8 @@ extern long __static_call_return0(void);
#else /* Generic implementation */
+#define static_call_initialized 0
+
static inline int static_call_init(void) { return 0; }
static inline long __static_call_return0(void)
next prev parent reply other threads:[~2024-12-18 9:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-18 8:02 [PATCH] x86/static-call: fix " Juergen Gross
2024-12-18 9:43 ` tip-bot2 for Juergen Gross [this message]
2024-12-18 9:47 ` Peter Zijlstra
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=173451502997.7135.15176892215475394042.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=sfr@canb.auug.org.au \
--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®