Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

x86/static-call: fix 32-bit build

Browse Source 
commit 349f0086ba upstream.

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.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: 0ef8047b73 ("x86/static-call: provide a way to do very early static-call updates")
Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Juergen Gross 2024-12-18 09:02:28 +01:00 committed by Greg Kroah-Hartman
parent e7c1fcdda4
commit 20ad30bed7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/static_call.h
View File

@ -100,7 +100,6 @@
#ifdef CONFIG_HAVE_STATIC_CALL #ifdef CONFIG_HAVE_STATIC_CALL
#include <asm/static_call.h> #include <asm/static_call.h>
extern bool static_call_initialized;
/* /*
* Either @site or @tramp can be NULL. * Either @site or @tramp can be NULL.
*/ */
@ -121,6 +120,8 @@ extern void arch_static_call_transform(void *site, void *tramp, void *func, bool
#ifdef CONFIG_HAVE_STATIC_CALL_INLINE #ifdef CONFIG_HAVE_STATIC_CALL_INLINE
extern bool static_call_initialized;
extern int __init static_call_init(void); extern int __init static_call_init(void);
struct static_call_mod { struct static_call_mod {
@ -184,6 +185,8 @@ extern int static_call_text_reserved(void *start, void *end);
#elif defined(CONFIG_HAVE_STATIC_CALL) #elif defined(CONFIG_HAVE_STATIC_CALL)
#define static_call_initialized 0
static inline int static_call_init(void) { return 0; } static inline int static_call_init(void) { return 0; }
struct static_call_key { struct static_call_key {
@ -235,6 +238,8 @@ static inline int static_call_text_reserved(void *start, void *end)
#else /* Generic implementation */ #else /* Generic implementation */
#define static_call_initialized 0
static inline int static_call_init(void) { return 0; } static inline int static_call_init(void) { return 0; }
struct static_call_key { struct static_call_key {