[PATCH] Compile problems in locking-selftest.c with CONFIG_DEBUG_PREEMPT

[PATCH] Compile problems in locking-selftest.c with CONFIG_DEBUG_PREEMPT

[John Kacur]

[-- Attachment #1: Type: text/plain, Size: 295 bytes --]

The attached patch fixes the following compiler error in the rt-kernel
if CONFIG_DEBUG_PREEMPT is enabled.

lib/locking-selftest.c: In function 'dotest':
lib/locking-selftest.c:951: error: incompatible types in initialization
lib/locking-selftest.c:1003: error: incompatible types in assignment

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: locking-selftest-fix.patch --]
[-- Type: text/x-patch; name=locking-selftest-fix.patch, Size: 907 bytes --]

Subject: Compile problems in locking-selftest.c with CONFIG_DEBUG_PREEMPT

lib/locking-selftest.c: In function ‘dotest’:
lib/locking-selftest.c:951: error: incompatible types in initialization
lib/locking-selftest.c:1003: error: incompatible types in assignment

Signed-off-by: John Kacur <jkacur at gmail dot com>

Index: linux-2.6.26.1-rt1.jk/lib/locking-selftest.c
===================================================================
--- linux-2.6.26.1-rt1.jk.orig/lib/locking-selftest.c
+++ linux-2.6.26.1-rt1.jk/lib/locking-selftest.c
@@ -948,7 +948,7 @@ static void dotest(void (*testcase_fn)(v
 	unsigned long saved_preempt_count = preempt_count();
 	int expected_failure = 0;
 #if defined(CONFIG_DEBUG_PREEMPT) && defined(CONFIG_DEBUG_RT_MUTEXES)
-        int saved_lock_count = current->lock_count;
+        atomic_t saved_lock_count = current->lock_count;
 #endif
 
 	WARN_ON(irqs_disabled());

[PATCH] lockdep: fix build if CONFIG_PROVE_LOCKING not defined

[Stephen Hemminger]

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);

Re: [PATCH] lockdep: fix build if CONFIG_PROVE_LOCKING not defined

[Ingo Molnar]

* Stephen Hemminger <shemminger@vyatta.com> wrote:

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

applied to tip/core/urgent, thanks Stephen. I'm wondering, could you 
send me the config that produces the build error? I do fairly 
comprehensive build testing but this one does not seem to trigger.

	Ingo