---

yaml --- r: 31746 b: refs/heads/master c: 88fecaa h: refs/heads/master v: v3
git-mirror · Jul 3, 2006 · 512bed8 · 512bed8
1 parent 501ecf6
commit 512bed8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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 &&