aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/lockdep.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 8a0efac4f99d..e5deddadeab1 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2000,7 +2000,7 @@ static inline int lookup_chain_cache(struct task_struct *curr,
2000 struct lock_class *class = hlock_class(hlock); 2000 struct lock_class *class = hlock_class(hlock);
2001 struct list_head *hash_head = chainhashentry(chain_key); 2001 struct list_head *hash_head = chainhashentry(chain_key);
2002 struct lock_chain *chain; 2002 struct lock_chain *chain;
2003 struct held_lock *hlock_curr, *hlock_next; 2003 struct held_lock *hlock_curr;
2004 int i, j; 2004 int i, j;
2005 2005
2006 /* 2006 /*
@@ -2057,12 +2057,10 @@ cache_hit:
2057 chain->chain_key = chain_key; 2057 chain->chain_key = chain_key;
2058 chain->irq_context = hlock->irq_context; 2058 chain->irq_context = hlock->irq_context;
2059 /* Find the first held_lock of current chain */ 2059 /* Find the first held_lock of current chain */
2060 hlock_next = hlock;
2061 for (i = curr->lockdep_depth - 1; i >= 0; i--) { 2060 for (i = curr->lockdep_depth - 1; i >= 0; i--) {
2062 hlock_curr = curr->held_locks + i; 2061 hlock_curr = curr->held_locks + i;
2063 if (hlock_curr->irq_context != hlock_next->irq_context) 2062 if (hlock_curr->irq_context != hlock->irq_context)
2064 break; 2063 break;
2065 hlock_next = hlock;
2066 } 2064 }
2067 i++; 2065 i++;
2068 chain->depth = curr->lockdep_depth + 1 - i; 2066 chain->depth = curr->lockdep_depth + 1 - i;