The patch titled
lockdep: debug_locks check after check_chain_key
has been added to the -mm tree. Its filename is
lockdep-debug_locks-check-after-check_chain_key.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: lockdep: debug_locks check after check_chain_key
From: Jarek Poplawski <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
Cc: Ingo Molnar <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
kernel/lockdep.c | 4 ++++
1 file changed, 4 insertions(+)
diff -puN kernel/lockdep.c~lockdep-debug_locks-check-after-check_chain_key
kernel/lockdep.c
--- a/kernel/lockdep.c~lockdep-debug_locks-check-after-check_chain_key
+++ a/kernel/lockdep.c
@@ -2227,6 +2227,10 @@ out_calc_hash:
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");
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
origin.patch
br_if-oops-in-port_carrier_check.patch
lockdep-debug_locks-check-after-check_chain_key.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
