Commit:     60e114d1134555d1813e20a8cd86304331da05c7
Parent:     34173a4aad7a641e72b70f9927ca797746fbce69
Author:     Jarek Poplawski <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 20 13:58:00 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Tue Feb 20 17:10:14 2007 -0800

    [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 <[EMAIL PROTECTED]>
    Cc: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 kernel/lockdep.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

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 @@ out_calc_hash:
+       if (unlikely(!debug_locks))
+               return 0;
        if (unlikely(curr->lockdep_depth >= MAX_LOCK_DEPTH)) {
                printk("BUG: MAX_LOCK_DEPTH too low!\n");
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to