aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRabin Vincent <rabin@rab.in>2008-08-11 03:30:26 -0400
committerIngo Molnar <mingo@elte.hu>2008-08-11 03:30:26 -0400
commit8bfe0298f7a04952d19f4a2cf510d7a6311eeed0 (patch)
treef90c216c26c0d73128a713d5142ccaefa2dce353
parent7cd5a02f54f4c9d16cf7fdffa2122bc73bb09b43 (diff)
lockdep: handle chains involving classes defined in modules
Solve this by marking the classes as unused and not printing information about the unused classes. Reported-by: Eric Sesterhenn <snakebyte@gmx.de> Signed-off-by: Rabin Vincent <rabin@rab.in> Acked-by: Huang Ying <ying.huang@intel.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/lockdep.c1
-rw-r--r--kernel/lockdep_proc.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 410c3365ad8f..ab933fecd2a1 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -3176,6 +3176,7 @@ static void zap_class(struct lock_class *class)
3176 list_del_rcu(&class->hash_entry); 3176 list_del_rcu(&class->hash_entry);
3177 list_del_rcu(&class->lock_entry); 3177 list_del_rcu(&class->lock_entry);
3178 3178
3179 class->key = NULL;
3179} 3180}
3180 3181
3181static inline int within(const void *addr, void *start, unsigned long size) 3182static inline int within(const void *addr, void *start, unsigned long size)
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
index 6252ff799d19..fa19aee604c2 100644
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
@@ -201,6 +201,9 @@ static int lc_show(struct seq_file *m, void *v)
201 201
202 for (i = 0; i < chain->depth; i++) { 202 for (i = 0; i < chain->depth; i++) {
203 class = lock_chain_get_class(chain, i); 203 class = lock_chain_get_class(chain, i);
204 if (!class->key)
205 continue;
206
204 seq_printf(m, "[%p] ", class->key); 207 seq_printf(m, "[%p] ", class->key);
205 print_name(m, class); 208 print_name(m, class);
206 seq_puts(m, "\n"); 209 seq_puts(m, "\n");