aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--init/main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c
index b2f3b566790e..c8960b9df623 100644
--- a/init/main.c
+++ b/init/main.c
@@ -496,8 +496,8 @@ asmlinkage void __init start_kernel(void)
496 init_timers(); 496 init_timers();
497 hrtimers_init(); 497 hrtimers_init();
498 softirq_init(); 498 softirq_init();
499 time_init();
500 timekeeping_init(); 499 timekeeping_init();
500 time_init();
501 501
502 /* 502 /*
503 * HACK ALERT! This is early. We're enabling the console before 503 * HACK ALERT! This is early. We're enabling the console before
@@ -508,6 +508,8 @@ asmlinkage void __init start_kernel(void)
508 if (panic_later) 508 if (panic_later)
509 panic(panic_later, panic_param); 509 panic(panic_later, panic_param);
510 profile_init(); 510 profile_init();
511 if (!irqs_disabled())
512 printk("start_kernel(): bug: interrupts were enabled early\n");
511 local_irq_enable(); 513 local_irq_enable();
512#ifdef CONFIG_BLK_DEV_INITRD 514#ifdef CONFIG_BLK_DEV_INITRD
513 if (initrd_start && !initrd_below_start_ok && 515 if (initrd_start && !initrd_below_start_ok &&