From 38252cc0a1399d7b747acc283ad555b0d6167ba3 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 25 Jul 2011 12:09:59 +0200 Subject: [PATCH] --- yaml --- r: 262421 b: refs/heads/master c: 70a0686a72c7a7e554b404ca11406ceec709d425 h: refs/heads/master i: 262419: c2cba13190a58f82ece344f8b3bbaca4334a7b3d v: v3 --- [refs] | 2 +- trunk/kernel/lockdep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ad8be4cdd048..d4b18c3a240f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d36b26be0f3c6b86e3ab7e1539e42f3a3bc79ca +refs/heads/master: 70a0686a72c7a7e554b404ca11406ceec709d425 diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c index 74ca247a4d4f..5903586f32a0 100644 --- a/trunk/kernel/lockdep.c +++ b/trunk/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))