From 36d1535408ea898d3300a76816dfed5a9348e9b2 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 30 Jul 2012 14:40:09 -0700
Subject: [PATCH] --- yaml --- r: 319899 b: refs/heads/master c:
 acc8fa41ad31c576cdbc569cc3e0e443b1b98b44 h: refs/heads/master i:   319897:
 b6d79350a025af21b816c3947f745acae7e03d43   319895:
 90245017ea71146af93bb3a66fdd1e40f25cd8d5 v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/printk.h | 26 ++++++++++++++++++++++++++
 trunk/kernel/printk.c        | 14 +++++++++-----
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e50cbca25253..2b50d8bd8573 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdf53441368cc02ee4aa8a8343a5dc25132836f0
+refs/heads/master: acc8fa41ad31c576cdbc569cc3e0e443b1b98b44
diff --git a/trunk/include/linux/printk.h b/trunk/include/linux/printk.h
index 1bec2f7a2d42..6e12e1f09047 100644
--- a/trunk/include/linux/printk.h
+++ b/trunk/include/linux/printk.h
@@ -24,6 +24,32 @@ extern const char linux_proc_banner[];
  */
 #define KERN_CONT	"<c>"
 
+static inline int printk_get_level(const char *buffer)
+{
+	if (buffer[0] == '<' && buffer[1] && buffer[2] == '>') {
+		switch (buffer[1]) {
+		case '0' ... '7':
+		case 'd':	/* KERN_DEFAULT */
+		case 'c':	/* KERN_CONT */
+			return buffer[1];
+		}
+	}
+	return 0;
+}
+
+static inline const char *printk_skip_level(const char *buffer)
+{
+	if (printk_get_level(buffer)) {
+		switch (buffer[1]) {
+		case '0' ... '7':
+		case 'd':	/* KERN_DEFAULT */
+		case 'c':	/* KERN_CONT */
+			return buffer + 3;
+		}
+	}
+	return buffer;
+}
+
 extern int console_printk[];
 
 #define console_loglevel (console_printk[0])
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 852269adad25..0d882a2f231e 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -1487,6 +1487,7 @@ 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,17 +1544,20 @@ asmlinkage int vprintk_emit(int facility, int level,
 	}
 
 	/* strip syslog prefix and extract log level or control flags */
-	if (text[0] == '<' && text[1] && text[2] == '>') {
-		switch (text[1]) {
+	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 = text[1] - '0';
+				level = kern_level - '0';
 		case 'd':	/* KERN_DEFAULT */
 			lflags |= LOG_PREFIX;
 		case 'c':	/* KERN_CONT */
-			text += 3;
-			text_len -= 3;
+			break;
 		}
+		text_len -= end_of_header - text;
+		text = (char *)end_of_header;
 	}
 
 	if (level == -1)