1 files changed, 9 insertions, 5 deletions

diff --git a/init/main.c b/init/main.c
index 8651a720a092..913e48d658ee 100644
--- a/init/main.c
+++ b/init/main.c
@@ -162,16 +162,19 @@ extern struct obs_kernel_param __setup_start[], __setup_end[];
 static int __init obsolete_checksetup(char *line)
 {
         struct obs_kernel_param *p;
+        int had_early_param = 0;
 
         p = __setup_start;
         do {
                 int n = strlen(p->str);
                 if (!strncmp(line, p->str, n)) {
                         if (p->early) {
-                                /* Already done in parse_early_param?  (Needs
-                                 * exact match on param part) */
+                                /* Already done in parse_early_param?
+                                 * (Needs exact match on param part).
+                                 * Keep iterating, as we can have early
+                                 * params and __setups of same names 8( */
                                 if (line[n] == '\0' || line[n] == '=')
-                                        return 1;
+                                        had_early_param = 1;
                         } else if (!p->setup_func) {
                                 printk(KERN_WARNING "Parameter %s is obsolete,"
                                        " ignored\n", p->str);
@@ -181,7 +184,8 @@ static int __init obsolete_checksetup(char *line)
                 }
                 p++;
         } while (p < __setup_end);
-        return 0;
+
+        return had_early_param;
 }
 
 /*
@@ -464,6 +468,7 @@ asmlinkage void __init start_kernel(void)
          * Need to run as early as possible, to initialize the
          * lockdep hash:
          */
+        unwind_init();
         lockdep_init();
 
         local_irq_disable();
@@ -502,7 +507,6 @@ asmlinkage void __init start_kernel(void)
                    __stop___param - __start___param,
                    &unknown_bootoption);
         sort_main_extable();
-        unwind_init();
         trap_init();
         rcu_init();
         init_IRQ();