Commit df60a844 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Ingo Molnar
Browse files

lockdep: fix build if CONFIG_PROVE_LOCKING not defined 



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

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2df8b1d6

kernel/lockdep_proc.c

+6 −6
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ static void print_name(struct seq_file *m, struct lock_class *class) 


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, void *v) 
#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_file *m, void *v) 
		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);