---

yaml --- r: 39359 b: refs/heads/master c: 256a6b4 h: refs/heads/master i: 39357: e06c7b4 39355: 30b7c0d 39351: 723298b 39343: 6fbb8b0 39327: 0299469 39295: b872442 v: v3
git-mirror · Oct 11, 2006 · 3426512 · 3426512
1 parent 40f86ee
commit 3426512
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fcce7432a731e67f1cd3ef1e71dca9ea84dedb1
+refs/heads/master: 256a6b41365e17cebe5c2fc91ddff716c9aa055a
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
@@ -820,15 +820,8 @@ void release_console_sem(void)
 	console_locked = 0;
 	up(&console_sem);
 	spin_unlock_irqrestore(&logbuf_lock, flags);
-	if (wake_klogd && !oops_in_progress && waitqueue_active(&log_wait)) {
-		/*
-		 * If we printk from within the lock dependency code,
-		 * from within the scheduler code, then do not lock
-		 * up due to self-recursion:
-		 */
-		if (!lockdep_internal())
-			wake_up_interruptible(&log_wait);
-	}
+	if (wake_klogd && !oops_in_progress && waitqueue_active(&log_wait))
+		wake_up_interruptible(&log_wait);
 }
 EXPORT_SYMBOL(release_console_sem);