---

yaml --- r: 311788 b: refs/heads/master c: cb424ff h: refs/heads/master v: v3
git-mirror · Jul 6, 2012 · aae2c0b · aae2c0b
1 parent 81cd720
commit aae2c0b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43a73a50b352cd3df25b3ced72033942a6a0f919
+refs/heads/master: cb424ffe9f45ad80267f2a98fbd9bf21caa0ce22
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
@@ -1021,7 +1021,6 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
 {
 	bool clear = false;
 	static int saved_console_loglevel = -1;
-	static DEFINE_MUTEX(syslog_mutex);
 	int error;
 
 	error = check_syslog_permissions(type, from_file);
@@ -1048,17 +1047,11 @@ int do_syslog(int type, char __user *buf, int len, bool from_file)
 			error = -EFAULT;
 			goto out;
 		}
-		error = mutex_lock_interruptible(&syslog_mutex);
-		if (error)
-			goto out;
 		error = wait_event_interruptible(log_wait,
 						 syslog_seq != log_next_seq);
-		if (error) {
-			mutex_unlock(&syslog_mutex);
+		if (error)
 			goto out;
-		}
 		error = syslog_print(buf, len);
-		mutex_unlock(&syslog_mutex);
 		break;
 	/* Read/clear last kernel messages */
 	case SYSLOG_ACTION_READ_CLEAR: