Messages in this thread Patch in this message | | | Date | Thu, 4 Aug 2011 08:34:50 GMT | From | tip-bot for Peter Zijlstra <> | Subject | [tip:core/urgent] lockdep: Fix up warning |
| |
Commit-ID: 70a0686a72c7a7e554b404ca11406ceec709d425 Gitweb: http://git.kernel.org/tip/70a0686a72c7a7e554b404ca11406ceec709d425 Author: Peter Zijlstra <a.p.zijlstra@chello.nl> AuthorDate: Mon, 25 Jul 2011 12:09:59 +0200 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Thu, 4 Aug 2011 10:17:41 +0200
lockdep: Fix up warning
On Sun, 2011-07-24 at 21:06 -0400, Arnaud Lacombe wrote:
> /src/linux/linux/kernel/lockdep.c: In function 'mark_held_locks': > /src/linux/linux/kernel/lockdep.c:2471:31: warning: comparison of > distinct pointer types lacks a cast
The warning is harmless in this case, but the below makes it go away.
Reported-by: Arnaud Lacombe <lacombar@gmail.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1311588599.2617.56.camel@laptop Signed-off-by: Ingo Molnar <mingo@elte.hu> --- kernel/lockdep.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/kernel/lockdep.c b/kernel/lockdep.c index 74ca247..5903586 100644 --- a/kernel/lockdep.c +++ b/kernel/lockdep.c @@ -2468,7 +2468,7 @@ mark_held_locks(struct task_struct *curr, enum mark_type mark) BUG_ON(usage_bit >= LOCK_USAGE_STATES); - if (hlock_class(hlock)->key == &__lockdep_no_validate__) + if (hlock_class(hlock)->key == __lockdep_no_validate__.subkeys) continue; if (!mark_lock(curr, hlock, usage_bit))
| |