diff --git a/[refs] b/[refs]
index dabe578bda1f..56d90bcf2462 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34f1ca540679f61a02b7406f036d9edde9717ee2
+refs/heads/master: c4a68306b9c0939b3facdad2cc5e34d660ff463a
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 2b1cdaab45e6..bc27d72bbb19 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -538,6 +538,11 @@ asmlinkage void __init start_kernel(void)
 	parse_args("Booting kernel", command_line, __start___param,
 		   __stop___param - __start___param,
 		   &unknown_bootoption);
+	if (!irqs_disabled()) {
+		printk(KERN_WARNING "start_kernel(): bug: interrupts were "
+				"enabled *very* early, fixing it\n");
+		local_irq_disable();
+	}
 	sort_main_extable();
 	trap_init();
 	rcu_init();