From 441591bf5ea5a44abfbda68a3b7eefab999f5511 Mon Sep 17 00:00:00 2001
From: qinghuang feng <qhfeng.kernel@gmail.com>
Date: Tue, 28 Oct 2008 17:24:28 +0800
Subject: [PATCH] --- yaml --- r: 117975 b: refs/heads/master c:
 46fec7ac40e452a2ea5e63648d98b6bb2b5898f9 h: refs/heads/master i:   117973:
 e55d9c395e2e1d944a3854d0945d85ec5acf65c5   117971:
 eaea6ae21a87173ed11c0009b749c8f90790cc0e   117967:
 d09d6781e9a6b25a61a96e815d56035f19117eb5 v: v3

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

diff --git a/[refs] b/[refs]
index ba329847f4c2..75535de95532 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03967c5267b0e7312d1d55dc814d94cf190ca573
+refs/heads/master: 46fec7ac40e452a2ea5e63648d98b6bb2b5898f9
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index dbda475b13bd..11832acdde77 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -3417,9 +3417,10 @@ void debug_show_all_locks(void)
 		}
 		printk(" ignoring it.\n");
 		unlock = 0;
+	} else {
+		if (count != 10)
+			printk(KERN_CONT " locked it.\n");
 	}
-	if (count != 10)
-		printk(" locked it.\n");
 
 	do_each_thread(g, p) {
 		/*