Home » Mailing list archives » linux-kernel » 2008 » August » 15

[PATCH] lockdep: fix build if CONFIG_PROVE_LOCKING not defined

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Stephen Hemminger <shemminger@...>
To: John Kacur <jkacur@...>, Rabin Vincent <rabin@...>
Cc: <linux-kernel@...>, David Miller <davem@...>
Subject: [PATCH] lockdep: fix build if CONFIG_PROVE_LOCKING not defined
Date: Friday, August 15, 2008 - 12:33 pm

If CONFIG_PROVE_LOCKING not defined, then no dependency information
is available.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

--- a/kernel/lockdep_proc.c	2008-08-15 09:21:46.000000000 -0700
+++ b/kernel/lockdep_proc.c	2008-08-15 09:29:59.000000000 -0700
@@ -82,7 +82,6 @@ static void print_name(struct seq_file *
 
 static int l_show(struct seq_file *m, void *v)
 {
-	unsigned long nr_forward_deps, nr_backward_deps;
 	struct lock_class *class = v;
 	struct lock_list *entry;
 	char c1, c2, c3, c4;
@@ -96,11 +95,10 @@ static int l_show(struct seq_file *m, vo
 #ifdef CONFIG_DEBUG_LOCKDEP
 	seq_printf(m, " OPS:%8ld", class->ops);
 #endif
-	nr_forward_deps = lockdep_count_forward_deps(class);
-	seq_printf(m, " FD:%5ld", nr_forward_deps);
-
-	nr_backward_deps = lockdep_count_backward_deps(class);
-	seq_printf(m, " BD:%5ld", nr_backward_deps);
+#ifdef CONFIG_PROVE_LOCKING
+	seq_printf(m, " FD:%5ld", lockdep_count_forward_deps(class));
+	seq_printf(m, " BD:%5ld", lockdep_count_backward_deps(class));
+#endif
 
 	get_usage_chars(class, &c1, &c2, &c3, &c4);
 	seq_printf(m, " %c%c%c%c", c1, c2, c3, c4);
@@ -325,7 +323,9 @@ static int lockdep_stats_show(struct seq
 		if (class->usage_mask & LOCKF_ENABLED_HARDIRQS_READ)
 			nr_hardirq_read_unsafe++;
 
+#ifdef CONFIG_PROVE_LOCKING
 		sum_forward_deps += lockdep_count_forward_deps(class);
+#endif
 	}
 #ifdef CONFIG_DEBUG_LOCKDEP
 	DEBUG_LOCKS_WARN_ON(debug_atomic_read(&nr_unused_locks) != nr_unused);
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH] Compile problems in locking-selftest.c with CONFIG_D..., John Kacur, (Fri Aug 15, 11:57 am)
[PATCH] lockdep: fix build if CONFIG_PROVE_LOCKING not defined, Stephen Hemminger, (Fri Aug 15, 12:33 pm)
Re: [PATCH] lockdep: fix build if CONFIG_PROVE_LOCKING not d..., Ingo Molnar, (Fri Aug 15, 1:22 pm)