kallsyms: add support for relative offsets in kallsyms address table

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

diff --git a/init/main.c b/init/main.c
index 928a3438f7acbbcb16bb95071acfd942565fc8dc..031a60893fdbc2d52a189b428096c8e5668c7f99 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -496,11 +496,6 @@ asmlinkage __visible void __init start_kernel(void)
        char *command_line;
        char *after_dashes;
 
-       /*
-        * Need to run as early as possible, to initialize the
-        * lockdep hash:
-        */
-       lockdep_init();
        set_task_stack_end_magic(&init_task);
        smp_setup_processor_id();
        debug_objects_early_init();
@@ -724,7 +719,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;
 
@@ -732,8 +726,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);