Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c85ce13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull locking fix from Ingo Molnar:
 "A single fix for a locking statistics bug"

* 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  locking/lockdep: Fix lock used or unused stats error
parents 577d9460 68d41d8c

kernel/locking/lockdep_proc.c

+3 −2
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ static int lockdep_stats_show(struct seq_file *m, void *v) 
		      nr_hardirq_read_safe = 0, nr_hardirq_read_unsafe = 0,

		      sum_forward_deps = 0;



#ifdef CONFIG_PROVE_LOCKING

	list_for_each_entry(class, &all_lock_classes, lock_entry) {



		if (class->usage_mask == 0)
@@ -241,12 +242,12 @@ static int lockdep_stats_show(struct seq_file *m, void *v) 
		if (class->usage_mask & LOCKF_ENABLED_HARDIRQ_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);

#endif



#endif

	seq_printf(m, " lock-classes:                  %11lu [max: %lu]\n",

			nr_lock_classes, MAX_LOCKDEP_KEYS);