path: root/init
diff options
authorRasmus Villemoes <>2016-06-24 14:50:30 -0700
committerLinus Torvalds <>2016-06-24 17:23:52 -0700
commit0fd5ed8d897cffdc74903931bd7fcc9d8d154460 (patch)
treeda9967c1b84176f2d01e24d013182007204c5919 /init
parent5a9294e5c535deab69831076af15cd35e1c95f8b (diff)
init/main.c: fix initcall_blacklisted on ia64, ppc64 and parisc64
When I replaced kasprintf("%pf") with a direct call to sprint_symbol_no_offset I must have broken the initcall blacklisting feature on the arches where dereference_function_descriptor() is non-trivial. Fixes: c8cdd2be213f (init/main.c: simplify initcall_blacklisted()) Link: Signed-off-by: Rasmus Villemoes <> Cc: Yang Shi <> Cc: Prarit Bhargava <> Cc: Petr Mladek <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'init')
1 files changed, 3 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index 4c17fda5c2ff..63a5afb54f25 100644
--- a/init/main.c
+++ b/init/main.c
@@ -708,11 +708,13 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
struct blacklist_entry *entry;
char fn_name[KSYM_SYMBOL_LEN];
+ unsigned long addr;
if (list_empty(&blacklisted_initcalls))
return false;
- sprint_symbol_no_offset(fn_name, (unsigned long)fn);
+ addr = (unsigned long) dereference_function_descriptor(fn);
+ sprint_symbol_no_offset(fn_name, addr);
list_for_each_entry(entry, &blacklisted_initcalls, next) {
if (!strcmp(fn_name, entry->buf)) {