Merge tag 'imx-cleanup-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...

[cascardo/linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index b3c6e36..4c17fda 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -569,6 +569,7 @@ asmlinkage __visible void __init start_kernel(void)
        timekeeping_init();
        time_init();
        sched_clock_postinit();
+       printk_nmi_init();
        perf_event_init();
        profile_init();
        call_function_init();
@@ -706,21 +707,20 @@ static int __init initcall_blacklist(char *str)
 static bool __init_or_module initcall_blacklisted(initcall_t fn)
 {
        struct blacklist_entry *entry;
-       char *fn_name;
+       char fn_name[KSYM_SYMBOL_LEN];
 
-       fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
-       if (!fn_name)
+       if (list_empty(&blacklisted_initcalls))
                return false;
 
+       sprint_symbol_no_offset(fn_name, (unsigned long)fn);
+
        list_for_each_entry(entry, &blacklisted_initcalls, next) {
                if (!strcmp(fn_name, entry->buf)) {
                        pr_debug("initcall %s blacklisted\n", fn_name);
-                       kfree(fn_name);
                        return true;
                }
        }
 
-       kfree(fn_name);
        return false;
 }
 #else