From d669cd3a7adecd27b7a275970e05d7b8e713b4d0 Mon Sep 17 00:00:00 2001
From: Guillaume Chazarain <guichaz@yahoo.fr>
Date: Sun, 8 Jan 2006 01:02:41 -0800
Subject: [PATCH] --- yaml --- r: 16953 b: refs/heads/master c:
 025510cd20f4c35c3958bea133d96c9bd7c6ef9e h: refs/heads/master i:   16951:
 ca3a45ee3a2e4b6854610d80834d8dbf04beb8af v: v3

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

diff --git a/[refs] b/[refs]
index de466fd68af1..4497c684010f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2520f14ca85e38f575eed6acc6e586df246abea6
+refs/heads/master: 025510cd20f4c35c3958bea133d96c9bd7c6ef9e
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 5287be83e3e7..2251be80cd22 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -569,7 +569,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
 				   p[1] <= '7' && p[2] == '>') {
 					loglev_char = p[1];
 					p += 3;
-					printed_len += 3;
+					printed_len -= 3;
 				} else {
 					loglev_char = default_message_loglevel
 						+ '0';
@@ -584,7 +584,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
 
 				for (tp = tbuf; tp < tbuf + tlen; tp++)
 					emit_log_char(*tp);
-				printed_len += tlen - 3;
+				printed_len += tlen;
 			} else {
 				if (p[0] != '<' || p[1] < '0' ||
 				   p[1] > '7' || p[2] != '>') {
@@ -592,8 +592,8 @@ asmlinkage int vprintk(const char *fmt, va_list args)
 					emit_log_char(default_message_loglevel
 						+ '0');
 					emit_log_char('>');
+					printed_len += 3;
 				}
-				printed_len += 3;
 			}
 			log_level_unknown = 0;
 			if (!*p)