From 0196fec2f0161e46b9c1a99414596ac2ba330514 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Thu, 7 Jul 2011 11:39:45 +0200
Subject: [PATCH] --- yaml --- r: 256993 b: refs/heads/master c:
 efbe2eee6dc0f179be84292bf269528b3ec365e9 h: refs/heads/master i:   256991:
 0abe053ebe81f6e74592b25a0ea07fab1b39dfbf v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/lockdep.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3987feb76455..c1b08241b1ee 100644
--- 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
index 298c9276dfdb..628276d05915 100644
--- 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;
 	}