Merge branch 'x86-txt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / kernel / lockdep_proc.c

diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
index 8dac8402e07e6214fd7be90198f9790fb0717f0e..d4b3dbc79fdb353cde01ee5eef13b8cf203a34aa 100644 (file)
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
@@ -199,16 +199,10 @@ static void lockdep_stats_debug_show(struct seq_file *m)
                debug_atomic_read(&chain_lookup_hits));
        seq_printf(m, " cyclic checks:                 %11u\n",
                debug_atomic_read(&nr_cyclic_checks));
-       seq_printf(m, " cyclic-check recursions:       %11u\n",
-               debug_atomic_read(&nr_cyclic_check_recursions));
        seq_printf(m, " find-mask forwards checks:     %11u\n",
                debug_atomic_read(&nr_find_usage_forwards_checks));
-       seq_printf(m, " find-mask forwards recursions: %11u\n",
-               debug_atomic_read(&nr_find_usage_forwards_recursions));
        seq_printf(m, " find-mask backwards checks:    %11u\n",
                debug_atomic_read(&nr_find_usage_backwards_checks));
-       seq_printf(m, " find-mask backwards recursions:%11u\n",
-               debug_atomic_read(&nr_find_usage_backwards_recursions));
 
        seq_printf(m, " hardirq on events:             %11u\n", hi1);
        seq_printf(m, " hardirq off events:            %11u\n", hi2);
@@ -350,8 +344,6 @@ static int lockdep_stats_show(struct seq_file *m, void *v)
                        nr_unused);
        seq_printf(m, " max locking depth:             %11u\n",
                        max_lockdep_depth);
-       seq_printf(m, " max recursion depth:           %11u\n",
-                       max_recursion_depth);
 #ifdef CONFIG_PROVE_LOCKING
        seq_printf(m, " max bfs queue depth:           %11u\n",
                        max_bfs_queue_depth);
@@ -688,7 +680,8 @@ static int __init lockdep_proc_init(void)
                    &proc_lockdep_stats_operations);
 
 #ifdef CONFIG_LOCK_STAT
-       proc_create("lock_stat", S_IRUSR, NULL, &proc_lock_stat_operations);
+       proc_create("lock_stat", S_IRUSR | S_IWUSR, NULL,
+                   &proc_lock_stat_operations);
 #endif
 
        return 0;