commit 60e114d1134555d1813e20a8cd86304331da05c7
author Jarek Poplawski <jarkao2@o2.pl> Tue Feb 20 13:58:00 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Feb 20 17:10:14 2007 -0800
tree 2cd482be7f82b8c2f6bf1fde7bcf288471e4cd6b
parent 34173a4aad7a641e72b70f9927ca797746fbce69

[PATCH] lockdep: debug_locks check after check_chain_key

In __lock_acquire check_chain_key can turn off debug_locks, so check is
needed to assure proper return code.

Signed-off-by: Jarek Poplawski <jarkao2@o2.pl>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

kernel/lockdep.c

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 592c576..a08a172 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2228,6 +2228,10 @@
 
 	curr->lockdep_depth++;
 	check_chain_key(curr);
+#ifdef CONFIG_DEBUG_LOCKDEP
+	if (unlikely(!debug_locks))
+		return 0;
+#endif
 	if (unlikely(curr->lockdep_depth >= MAX_LOCK_DEPTH)) {
 		debug_locks_off();
 		printk("BUG: MAX_LOCK_DEPTH too low!\n");