Commit-ID: 15ea86b58c71d05e0921bebcf707aa30e43e9e25
Gitweb: https://git.kernel.org/tip/15ea86b58c71d05e0921bebcf707aa30e43e9e25
Author: Bart Van Assche <bvanass...@acm.org>
AuthorDate: Thu, 14 Feb 2019 15:00:38 -0800
Committer: Ingo Molnar <mi...@kernel.org>
CommitDate: Thu, 28 Feb 2019 07:55:39 +0100
locking/lockdep: Fix reported required memory size (2/2)
Lock chains are only tracked with CONFIG_PROVE_LOCKING=y. Do not report
the memory required for the lock chain array if CONFIG_PROVE_LOCKING=n.
See also commit:
ca58abcb4a6d ("lockdep: sanitise CONFIG_PROVE_LOCKING")
Include the size of the chain_hlocks[] array.
Signed-off-by: Bart Van Assche <bvanass...@acm.org>
Signed-off-by: Peter Zijlstra (Intel) <pet...@infradead.org>
Cc: Andrew Morton <a...@linux-foundation.org>
Cc: Johannes Berg <johan...@sipsolutions.net>
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Paul E. McKenney <paul...@linux.vnet.ibm.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Waiman Long <long...@redhat.com>
Cc: Will Deacon <will.dea...@arm.com>
Cc: johannes.b...@intel.com
Cc: t...@kernel.org
Link: https://lkml.kernel.org/r/20190214230058.196511-4-bvanass...@acm.org
Signed-off-by: Ingo Molnar <mi...@kernel.org>
---
kernel/locking/lockdep.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 57a523f0273c..ec6f6aff4d8d 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -4270,10 +4270,11 @@ void __init lockdep_init(void)
(sizeof(lock_classes) +
sizeof(classhash_table) +
sizeof(list_entries) +
- sizeof(lock_chains) +
sizeof(chainhash_table)
#ifdef CONFIG_PROVE_LOCKING
+ sizeof(lock_cq)
+ + sizeof(lock_chains)
+ + sizeof(chain_hlocks)
#endif
) / 1024
);
