---

yaml --- r: 211711 b: refs/heads/master c: 5b8c4f2 h: refs/heads/master i: 211709: fde51a8 211707: b48fb12 211703: c009049 211695: 97ea73f 211679: c99c546 211647: 48b5452 211583: b6c4a79 211455: 08ff593 v: v3
git-mirror · Oct 12, 2010 · d89ad24 · d89ad24
1 parent 8960726
commit d89ad24
Show file tree

Hide file tree

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