From b7097874615e860c60f902c69e7f9beba832130e Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 30 Jul 2012 14:40:19 -0700
Subject: [PATCH] --- yaml --- r: 319905 b: refs/heads/master c:
 088a52aac810655c1db1e40331e4936946701e9c h: refs/heads/master i:   319903:
 6c37ff669a008750772c99306d0b5014d706207d v: v3

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

diff --git a/[refs] b/[refs]
index cfb553aaaac4..d5040b43f93b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04d2c8c83d0e3ac5f78aeede51babb3236200112
+refs/heads/master: 088a52aac810655c1db1e40331e4936946701e9c
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 0d882a2f231e..6a76ab9d4476 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -1487,7 +1487,6 @@ asmlinkage int vprintk_emit(int facility, int level,
 	size_t text_len;
 	enum log_flags lflags = 0;
 	unsigned long flags;
-	int kern_level;
 	int this_cpu;
 	int printed_len = 0;
 
@@ -1543,21 +1542,24 @@ asmlinkage int vprintk_emit(int facility, int level,
 		lflags |= LOG_NEWLINE;
 	}
 
-	/* strip syslog prefix and extract log level or control flags */
-	kern_level = printk_get_level(text);
-	if (kern_level) {
-		const char *end_of_header = printk_skip_level(text);
-		switch (kern_level) {
-		case '0' ... '7':
-			if (level == -1)
-				level = kern_level - '0';
-		case 'd':	/* KERN_DEFAULT */
-			lflags |= LOG_PREFIX;
-		case 'c':	/* KERN_CONT */
-			break;
+	/* strip kernel syslog prefix and extract log level or control flags */
+	if (facility == 0) {
+		int kern_level = printk_get_level(text);
+
+		if (kern_level) {
+			const char *end_of_header = printk_skip_level(text);
+			switch (kern_level) {
+			case '0' ... '7':
+				if (level == -1)
+					level = kern_level - '0';
+			case 'd':	/* KERN_DEFAULT */
+				lflags |= LOG_PREFIX;
+			case 'c':	/* KERN_CONT */
+				break;
+			}
+			text_len -= end_of_header - text;
+			text = (char *)end_of_header;
 		}
-		text_len -= end_of_header - text;
-		text = (char *)end_of_header;
 	}
 
 	if (level == -1)