---

yaml --- r: 256993 b: refs/heads/master c: efbe2ee h: refs/heads/master i: 256991: 0abe053 v: v3
git-mirror · Jul 21, 2011 · 0196fec · 0196fec
1 parent 057bae7
commit 0196fec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4582c0a4866ea70c35aa9279e1f91834d3348a93
+refs/heads/master: efbe2eee6dc0f179be84292bf269528b3ec365e9
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
@@ -2468,6 +2468,9 @@ 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__)
+			continue;
+
 		if (!mark_lock(curr, hlock, usage_bit))
 			return 0;
 	}