2013-04-04 07:01:35

by Hong zhi guo

Subject: [PATCH] lockdep: remove unneccesary assignment in loop and the viarable

Signed-off-by: Hong Zhiguo <[email protected]>
---
kernel/lockdep.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 259db20..0f26597 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;
--
1.7.10.4

2013-04-10 09:24:18

by tip-bot for Vasyl Gomonovych

Subject: [tip:core/locking] lockdep: Remove unnecessary 'hlock_next' variable

Commit-ID: bfaf4af8abf92b883c04d137a0c18245cc9d51a2
Gitweb: http://git.kernel.org/tip/bfaf4af8abf92b883c04d137a0c18245cc9d51a2
Author: Hong Zhiguo <[email protected]>
AuthorDate: Thu, 4 Apr 2013 15:01:21 +0800
Committer: Ingo Molnar <[email protected]>
CommitDate: Mon, 8 Apr 2013 17:39:34 +0200

lockdep: Remove unnecessary 'hlock_next' variable

Signed-off-by: Hong Zhiguo <[email protected]>
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
kernel/lockdep.c | 6 ++----
1 file 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;