From aa112efaa31d1d9a4912c32d6084596a7fc25cf1 Mon Sep 17 00:00:00 2001
From: Ming Lei <tom.leiming@gmail.com>
Date: Thu, 16 Jul 2009 15:44:29 +0200
Subject: [PATCH] --- yaml --- r: 158111 b: refs/heads/master c:
 4dd861d6467007681991d8ec079d928db2018cbb h: refs/heads/master i:   158109:
 22a3af692dc442e0ca1dd2017c9016f522246e83   158107:
 dc2e91caff132d6db7d42ba332bd4276c4d2cebb   158103:
 98eee62bc59588299a8fcd6a6efd718d73a1f555   158095:
 808cfad883b4faffc29062563cb88e2b3ccdd92d   158079:
 b07a46456d9a97750c812aaa998626844c66ac47 v: v3

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

diff --git a/[refs] b/[refs]
index 8770b8fdc480..eba428f40b5f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef681026ff85c49b7399ceec3eb62bbbcce605e8
+refs/heads/master: 4dd861d6467007681991d8ec079d928db2018cbb
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
index b896f23e00cf..6358cf7e84b2 100644
--- a/trunk/kernel/lockdep.c
+++ b/trunk/kernel/lockdep.c
@@ -3429,7 +3429,11 @@ void __init lockdep_info(void)
 		sizeof(struct list_head) * CLASSHASH_SIZE +
 		sizeof(struct lock_list) * MAX_LOCKDEP_ENTRIES +
 		sizeof(struct lock_chain) * MAX_LOCKDEP_CHAINS +
-		sizeof(struct list_head) * CHAINHASH_SIZE) / 1024);
+		sizeof(struct list_head) * CHAINHASH_SIZE) / 1024
+#ifdef CONFIG_PROVE_LOCKING
+		+ sizeof(struct circular_queue) + sizeof(bfs_accessed)
+#endif
+		);
 
 	printk(" per task-struct memory footprint: %lu bytes\n",
 		sizeof(struct held_lock) * MAX_LOCK_DEPTH);