From 512bed8a2e8498b0a6d9e2bc07e33e21988f9d8a Mon Sep 17 00:00:00 2001 From: john stultz Date: Mon, 3 Jul 2006 00:24:04 -0700 Subject: [PATCH] --- yaml --- r: 31746 b: refs/heads/master c: 88fecaa27f398d95db6c405a1908292c6f0bc3ef h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/init/main.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 47fb72335013..3a39a1d2d2fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29454dde27d8e340bb1987bad9aa504af7081eba +refs/heads/master: 88fecaa27f398d95db6c405a1908292c6f0bc3ef diff --git a/trunk/init/main.c b/trunk/init/main.c index b2f3b566790e..c8960b9df623 100644 --- a/trunk/init/main.c +++ b/trunk/init/main.c @@ -496,8 +496,8 @@ asmlinkage void __init start_kernel(void) init_timers(); hrtimers_init(); softirq_init(); - time_init(); timekeeping_init(); + time_init(); /* * HACK ALERT! This is early. We're enabling the console before @@ -508,6 +508,8 @@ asmlinkage void __init start_kernel(void) if (panic_later) panic(panic_later, panic_param); profile_init(); + if (!irqs_disabled()) + printk("start_kernel(): bug: interrupts were enabled early\n"); local_irq_enable(); #ifdef CONFIG_BLK_DEV_INITRD if (initrd_start && !initrd_below_start_ok &&