Merge branch 'akpm-current/current'

[karo-tx-linux.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 8dc93df20f7fdb7fe100fd7bbd578e86773afad8..c0d3ff91c8e0653dd36486662aa35ad9da096552 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();
@@ -705,7 +706,6 @@ static int __init initcall_blacklist(char *str)
 
 static bool __init_or_module initcall_blacklisted(initcall_t fn)
 {
-       struct list_head *tmp;
        struct blacklist_entry *entry;
        char *fn_name;
 
@@ -713,8 +713,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
        if (!fn_name)
                return false;
 
-       list_for_each(tmp, &blacklisted_initcalls) {
-               entry = list_entry(tmp, struct blacklist_entry, next);
+       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);