summaryrefslogtreecommitdiff
path: root/kernel/static_call.c
diff options
context:
space:
mode:
authorNathan Chancellor <natechancellor@gmail.com>2020-09-28 16:09:39 -0700
committerPeter Zijlstra <peterz@infradead.org>2020-10-02 21:18:25 +0200
commit69e0ad37c9f32d5aa1beb02aab4ec0cd055be013 (patch)
treeb9aff2e803e144f9c8932c0da87b3ef7ed497bbe /kernel/static_call.c
parent547305a64632813286700cb6d768bfe773df7d19 (diff)
static_call: Fix return type of static_call_init
Functions that are passed to early_initcall should be of type initcall_t, which expects a return type of int. This is not currently an error but a patch in the Clang LTO series could change that in the future. Fixes: 9183c3f9ed71 ("static_call: Add inline static call infrastructure") Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Sami Tolvanen <samitolvanen@google.com> Link: https://lore.kernel.org/lkml/20200903203053.3411268-17-samitolvanen@google.com/
Diffstat (limited to 'kernel/static_call.c')
-rw-r--r--kernel/static_call.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/static_call.c b/kernel/static_call.c
index f8362b3f8fd5..84565c2a41b8 100644
--- a/kernel/static_call.c
+++ b/kernel/static_call.c
@@ -410,12 +410,12 @@ int static_call_text_reserved(void *start, void *end)
return __static_call_mod_text_reserved(start, end);
}
-void __init static_call_init(void)
+int __init static_call_init(void)
{
int ret;
if (static_call_initialized)
- return;
+ return 0;
cpus_read_lock();
static_call_lock();
@@ -434,6 +434,7 @@ void __init static_call_init(void)
#ifdef CONFIG_MODULES
register_module_notifier(&static_call_module_nb);
#endif
+ return 0;
}
early_initcall(static_call_init);