---

yaml --- r: 338354 b: refs/heads/master c: 6b898c0 h: refs/heads/master v: v3
git-mirror · Oct 24, 2012 · ea9b65c · ea9b65c
1 parent 00dae8a
commit ea9b65c
Show file tree

Hide file tree

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