diff --git a/[refs] b/[refs] index 0d7604960d73..ac2d2a1d790d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b7f5e3c7742d5332b78b831131f43fc3630e6322 +refs/heads/master: c9538ed49272fb244ac06ba643ff076a68a77e12 diff --git a/trunk/init/main.c b/trunk/init/main.c index 6b69564738c1..913e48d658ee 100644 --- a/trunk/init/main.c +++ b/trunk/init/main.c @@ -468,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(); @@ -506,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();