Merge tag 'xfs-5.5-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[linux.git] / kernel / locking / lockdep_proc.c

diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
index bda006f8a88be11c83bdb6fce4b63b9bf8d6e608..dadb7b7fba3733ca7dfe80cf5624c88b7c147c96 100644 (file)
--- a/kernel/locking/lockdep_proc.c
+++ b/kernel/locking/lockdep_proc.c
@@ -285,6 +285,12 @@ static int lockdep_stats_show(struct seq_file *m, void *v)
                        nr_process_chains);
        seq_printf(m, " stack-trace entries:           %11lu [max: %lu]\n",
                        nr_stack_trace_entries, MAX_STACK_TRACE_ENTRIES);
+#if defined(CONFIG_TRACE_IRQFLAGS) && defined(CONFIG_PROVE_LOCKING)
+       seq_printf(m, " number of stack traces:        %llu\n",
+                  lockdep_stack_trace_count());
+       seq_printf(m, " number of stack hash chains:   %llu\n",
+                  lockdep_stack_hash_count());
+#endif
        seq_printf(m, " combined max dependencies:     %11u\n",
                        (nr_hardirq_chains + 1) *
                        (nr_softirq_chains + 1) *
@@ -399,7 +405,7 @@ static void seq_lock_time(struct seq_file *m, struct lock_time *lt)
 
 static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
 {
-       struct lockdep_subclass_key *ckey;
+       const struct lockdep_subclass_key *ckey;
        struct lock_class_stats *stats;
        struct lock_class *class;
        const char *cname;