---

yaml --- r: 108186 b: refs/heads/master c: 8bfe029 h: refs/heads/master v: v3
git-mirror · Aug 11, 2008 · 84c6e4a · 84c6e4a
1 parent 7bd6303
commit 84c6e4a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cd5a02f54f4c9d16cf7fdffa2122bc73bb09b43
+refs/heads/master: 8bfe0298f7a04952d19f4a2cf510d7a6311eeed0
diff --git a/trunk/kernel/lockdep.c b/trunk/kernel/lockdep.c
@@ -3176,6 +3176,7 @@ static void zap_class(struct lock_class *class)
 	list_del_rcu(&class->hash_entry);
 	list_del_rcu(&class->lock_entry);
 
+	class->key = NULL;
 }
 
 static inline int within(const void *addr, void *start, unsigned long size)

diff --git a/trunk/kernel/lockdep_proc.c b/trunk/kernel/lockdep_proc.c
@@ -201,6 +201,9 @@ static int lc_show(struct seq_file *m, void *v)
 
 	for (i = 0; i < chain->depth; i++) {
 		class = lock_chain_get_class(chain, i);
+		if (!class->key)
+			continue;
+
 		seq_printf(m, "[%p] ", class->key);
 		print_name(m, class);
 		seq_puts(m, "\n");