Commit 349f0086 authored by Juergen Gross's avatar Juergen Gross Committed by Linus Torvalds
Browse files

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.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Fixes: 0ef8047b ("x86/static-call: provide a way to do very early static-call updates")
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent aef25be3

include/linux/static_call.h

+6 −1
Original line number Diff line number Diff line
@@ -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)