mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-12-29 09:16:33 +00:00
x86/static-call: fix 32-bit build
commit349f0086ba
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:
parent
4e54dc4bbc
commit
fb8c76c760
@ -138,7 +138,6 @@
|
||||
#ifdef CONFIG_HAVE_STATIC_CALL
|
||||
#include <asm/static_call.h>
|
||||
|
||||
extern bool 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 bool static_call_initialized;
|
||||
|
||||
extern int __init static_call_init(void);
|
||||
|
||||
struct static_call_mod {
|
||||
@ -216,6 +217,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, _func_init) \
|
||||
@ -266,6 +269,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)
|
||||
|
Loading…
Reference in New Issue
Block a user