Merge ARM fixes

1 files changed, 30 insertions, 14 deletions

diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
index b554b40a4aa6..58f35e586ee3 100644
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
@@ -10,7 +10,6 @@
  * Code for /proc/lockdep and /proc/lockdep_stats:
  *
  */
-#include <linux/sched.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
@@ -77,12 +76,29 @@ static unsigned long count_backward_deps(struct lock_class *class)
         return ret;
 }
 
+static void print_name(struct seq_file *m, struct lock_class *class)
+{
+        char str[128];
+        const char *name = class->name;
+
+        if (!name) {
+                name = __get_key_name(class->key, str);
+                seq_printf(m, "%s", name);
+        } else{
+                seq_printf(m, "%s", name);
+                if (class->name_version > 1)
+                        seq_printf(m, "#%d", class->name_version);
+                if (class->subclass)
+                        seq_printf(m, "/%d", class->subclass);
+        }
+}
+
 static int l_show(struct seq_file *m, void *v)
 {
         unsigned long nr_forward_deps, nr_backward_deps;
         struct lock_class *class = m->private;
-        char str[128], c1, c2, c3, c4;
-        const char *name;
+        struct lock_list *entry;
+        char c1, c2, c3, c4;
 
         seq_printf(m, "%p", class->key);
 #ifdef CONFIG_DEBUG_LOCKDEP
@@ -97,16 +113,16 @@ static int l_show(struct seq_file *m, void *v)
         get_usage_chars(class, &c1, &c2, &c3, &c4);
         seq_printf(m, " %c%c%c%c", c1, c2, c3, c4);
 
-        name = class->name;
-        if (!name) {
-                name = __get_key_name(class->key, str);
-                seq_printf(m, ": %s", name);
-        } else{
-                seq_printf(m, ": %s", name);
-                if (class->name_version > 1)
-                        seq_printf(m, "#%d", class->name_version);
-                if (class->subclass)
-                        seq_printf(m, "/%d", class->subclass);
+        seq_printf(m, ": ");
+        print_name(m, class);
+        seq_puts(m, "\n");
+
+        list_for_each_entry(entry, &class->locks_after, entry) {
+                if (entry->distance == 1) {
+                        seq_printf(m, " -> [%p] ", entry->class);
+                        print_name(m, entry->class);
+                        seq_puts(m, "\n");
+                }
         }
         seq_puts(m, "\n");
 
@@ -227,7 +243,7 @@ static int lockdep_stats_show(struct seq_file *m, void *v)
 
                 sum_forward_deps += count_forward_deps(class);
         }
-#ifdef CONFIG_LOCKDEP_DEBUG
+#ifdef CONFIG_DEBUG_LOCKDEP
         DEBUG_LOCKS_WARN_ON(debug_atomic_read(&nr_unused_locks) != nr_unused);
 #endif
         seq_printf(m, " lock-classes:                  %11lu [max: %lu]\n",