From aae2c0beac2053c13f29366ab30d493c48a4710f Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 6 Jul 2012 09:50:09 -0700 Subject: [PATCH] --- yaml --- r: 311788 b: refs/heads/master c: cb424ffe9f45ad80267f2a98fbd9bf21caa0ce22 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/printk.c | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 224ef4612875..15800640b0d2 100644 --- 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 index 37cde752cb8a..be9a82b2f0b3 100644 --- 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: