summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHong Zhiguo <honkiko@gmail.com>2013-04-04 15:01:21 +0800
committerIngo Molnar <mingo@kernel.org>2013-04-08 17:39:34 +0200
commitbfaf4af8abf92b883c04d137a0c18245cc9d51a2 (patch)
tree9bafb68139a2cdcc3f00341b8d231f3bb740f1bc
parent31880c37c11e28cb81c70757e38392b42e695dc6 (diff)
downloadop-kernel-dev-bfaf4af8abf92b883c04d137a0c18245cc9d51a2.zip
op-kernel-dev-bfaf4af8abf92b883c04d137a0c18245cc9d51a2.tar.gz
lockdep: Remove unnecessary 'hlock_next' variable
Signed-off-by: Hong Zhiguo <honkiko@gmail.com> Cc: peterz@infradead.org Link: http://lkml.kernel.org/r/1365058881-4044-1-git-send-email-honkiko@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--kernel/lockdep.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 8a0efac..e5dedda 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2000,7 +2000,7 @@ static inline int lookup_chain_cache(struct task_struct *curr,
struct lock_class *class = hlock_class(hlock);
struct list_head *hash_head = chainhashentry(chain_key);
struct lock_chain *chain;
- struct held_lock *hlock_curr, *hlock_next;
+ struct held_lock *hlock_curr;
int i, j;
/*
@@ -2057,12 +2057,10 @@ cache_hit:
chain->chain_key = chain_key;
chain->irq_context = hlock->irq_context;
/* Find the first held_lock of current chain */
- hlock_next = hlock;
for (i = curr->lockdep_depth - 1; i >= 0; i--) {
hlock_curr = curr->held_locks + i;
- if (hlock_curr->irq_context != hlock_next->irq_context)
+ if (hlock_curr->irq_context != hlock->irq_context)
break;
- hlock_next = hlock;
}
i++;
chain->depth = curr->lockdep_depth + 1 - i;
OpenPOWER on IntegriCloud