From 342651289e9b657f159b5a5f054ef98f385e5284 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 11 Oct 2006 01:22:08 -0700
Subject: [PATCH] --- yaml --- r: 39359 b: refs/heads/master c:
 256a6b41365e17cebe5c2fc91ddff716c9aa055a h: refs/heads/master i:   39357:
 e06c7b4bd28f6cb2f4199ef6ce8136fa0b7cbdbd   39355:
 30b7c0da8f30ce8074f4f1fa65f05fed0e8b8d9c   39351:
 723298b042787548dd3fcf70ecad914c9ec62b99   39343:
 6fbb8b0d149cbb3e45834e3de2a220fdcc68edb9   39327:
 0299469a84d4c5530ce2f908efc20d89216bf453   39295:
 b87244245d3e6c04e030f36c6a3faf01e772c4d0 v: v3

---
 [refs]                |  2 +-
 trunk/kernel/printk.c | 11 ++---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5ccd22d6579c..c557c3d9528b 100644
--- 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
index 771f5e861bcd..f7d427ef5038 100644
--- 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);