From 81cd72026fe48cc91fe4a7383fab793d2530d631 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Fri, 6 Jul 2012 09:50:09 -0700
Subject: [PATCH] --- yaml --- r: 311787 b: refs/heads/master c:
 43a73a50b352cd3df25b3ced72033942a6a0f919 h: refs/heads/master i:   311785:
 bf1524c2ad14f02bca2e6588d5238a67e94c9985   311783:
 f5037baccb5b1efb31ad7cab3ebfd8ac3b94cb8f v: v3

---
 [refs]                |  2 +-
 trunk/kernel/printk.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 817b41c8d5a3..224ef4612875 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3f5a5f27153228569f3396049838e9727dae86e
+refs/heads/master: 43a73a50b352cd3df25b3ced72033942a6a0f919
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 505863aa3a7f..37cde752cb8a 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -818,15 +818,18 @@ static size_t print_time(u64 ts, char *buf)
 static size_t print_prefix(const struct log *msg, bool syslog, char *buf)
 {
 	size_t len = 0;
+	unsigned int prefix = (msg->facility << 3) | msg->level;
 
 	if (syslog) {
 		if (buf) {
-			len += sprintf(buf, "<%u>", msg->level);
+			len += sprintf(buf, "<%u>", prefix);
 		} else {
 			len += 3;
-			if (msg->level > 9)
-				len++;
-			if (msg->level > 99)
+			if (prefix > 999)
+				len += 3;
+			else if (prefix > 99)
+				len += 2;
+			else if (prefix > 9)
 				len++;
 		}
 	}