The patch titled
lockdep: debug_locks check after check_chain_key
has been removed from the -mm tree. Its filename was
lockdep-debug_locks-check-after-check_chain_key.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: lockdep: debug_locks check after check_chain_key
From: Jarek Poplawski <jarkao2@xxxxx>
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@xxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
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
@@ -2228,6 +2228,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 jarkao2@xxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
