diff --git a/[refs] b/[refs]
index b56f6d9aaa59..b7242bf6431c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecbbfd44a08fa80e0d664814efd4c187721b85f6
+refs/heads/master: 6b898c07cb1d5bd8344a8044288bb4ae3873da74
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index ee79f14db358..22e070f3470a 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -1914,7 +1914,8 @@ static int __cpuinit console_cpu_notify(struct notifier_block *self,
  */
 void console_lock(void)
 {
-	BUG_ON(in_interrupt());
+	might_sleep();
+
 	down(&console_sem);
 	if (console_suspended)
 		return;