From d89ad241033914bcc8f6d8b55ce1c7fde1ebff8e Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 7 Sep 2010 14:33:43 +0000
Subject: [PATCH] --- yaml --- r: 211711 b: refs/heads/master c:
 5b8c4f23c54edda640a4850bc9b81dee70acb525 h: refs/heads/master i:   211709:
 fde51a8d52ae92eac95d78a40720d06d235ca3df   211707:
 b48fb122adff454efef606cd1a44a4df8311841e   211703:
 c0090499713270c7942da568b4b17046d52dd4c1   211695:
 97ea73f3948aee96462e4ba09f6930082faed90f   211679:
 c99c546f3dea5fe8dd392b0ea6add9db81393765   211647:
 48b54529a0c99dfdaf390682b35c19938908212a   211583:
 b6c4a791c07ea2671b2e11773daa95190f966ab1   211455:
 08ff5930c3fac10b78ee234b3ed471fa224200b4 v: v3

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

diff --git a/[refs] b/[refs]
index 23ac44afc09b..f3622079a371 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8192b1f6b1a46b33213b993471356495a93ffc70
+refs/heads/master: 5b8c4f23c54edda640a4850bc9b81dee70acb525
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 8fe465ac008a..2531017795f6 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -85,7 +85,7 @@ EXPORT_SYMBOL(oops_in_progress);
  * provides serialisation for access to the entire console
  * driver system.
  */
-static DECLARE_MUTEX(console_sem);
+static DEFINE_SEMAPHORE(console_sem);
 struct console *console_drivers;
 EXPORT_SYMBOL_GPL(console_drivers);
 
@@ -556,7 +556,7 @@ static void zap_locks(void)
 	/* If a crash is occurring, make sure we can't deadlock */
 	spin_lock_init(&logbuf_lock);
 	/* And make sure that we print immediately */
-	init_MUTEX(&console_sem);
+	sema_init(&console_sem, 1);
 }
 
 #if defined(CONFIG_PRINTK_TIME)