From a3b36fac790231cc5a679f554ac3d76eade73fdc Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Mon, 9 Aug 2010 17:20:36 -0700
Subject: [PATCH] --- yaml --- r: 207308 b: refs/heads/master c:
 8c4af38e9b2c2a78369c4e2e5706fe539ac64eb2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 720fcb51b25c..1a291ec669cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 547415d5edf8660aee040dc81d8c71b081a59bda
+refs/heads/master: 8c4af38e9b2c2a78369c4e2e5706fe539ac64eb2
diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c
index 4ab0164bcf84..8fe465ac008a 100644
--- a/trunk/kernel/printk.c
+++ b/trunk/kernel/printk.c
@@ -1549,9 +1549,9 @@ void kmsg_dump(enum kmsg_dump_reason reason)
 	chars = logged_chars;
 	spin_unlock_irqrestore(&logbuf_lock, flags);
 
-	if (logged_chars > end) {
-		s1 = log_buf + log_buf_len - logged_chars + end;
-		l1 = logged_chars - end;
+	if (chars > end) {
+		s1 = log_buf + log_buf_len - chars + end;
+		l1 = chars - end;
 
 		s2 = log_buf;
 		l2 = end;
@@ -1559,8 +1559,8 @@ void kmsg_dump(enum kmsg_dump_reason reason)
 		s1 = "";
 		l1 = 0;
 
-		s2 = log_buf + end - logged_chars;
-		l2 = logged_chars;
+		s2 = log_buf + end - chars;
+		l2 = chars;
 	}
 
 	if (!spin_trylock_irqsave(&dump_list_lock, flags)) {