lockdep: sanitise CONFIG_PROVE_LOCKING
Ensure that all of the lock dependency tracking code is under
CONFIG_PROVE_LOCKING. This allows us to use the held lock tracking code for
other purposes.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Jason Baron <jbaron@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index edba2ff..05c1261 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -95,6 +95,7 @@
unsigned long nr_list_entries;
static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
+#ifdef CONFIG_PROVE_LOCKING
/*
* Allocate a lockdep entry. (assumes the graph_lock held, returns
* with NULL on failure)
@@ -111,6 +112,7 @@
}
return list_entries + nr_list_entries++;
}
+#endif
/*
* All data structures here are protected by the global debug_lock.
@@ -140,7 +142,9 @@
static struct list_head classhash_table[CLASSHASH_SIZE];
unsigned long nr_lock_chains;
+#ifdef CONFIG_PROVE_LOCKING
static struct lock_chain lock_chains[MAX_LOCKDEP_CHAINS];
+#endif
/*
* We put the lock dependency chains into a hash-table as well, to cache
@@ -482,6 +486,7 @@
}
}
+#ifdef CONFIG_PROVE_LOCKING
/*
* Add a new dependency to the head of the list:
*/
@@ -541,6 +546,7 @@
return 0;
}
+#endif
static void print_kernel_version(void)
{
@@ -549,6 +555,7 @@
init_utsname()->version);
}
+#ifdef CONFIG_PROVE_LOCKING
/*
* When a circular dependency is detected, print the
* header first:
@@ -639,6 +646,7 @@
}
return 1;
}
+#endif
static int very_verbose(struct lock_class *class)
{
@@ -823,6 +831,7 @@
#endif
+#ifdef CONFIG_PROVE_LOCKING
static int
print_deadlock_bug(struct task_struct *curr, struct held_lock *prev,
struct held_lock *next)
@@ -1087,7 +1096,7 @@
return 0;
}
-
+#endif
/*
* Is this the address of a static object:
@@ -1307,6 +1316,7 @@
return class;
}
+#ifdef CONFIG_PROVE_LOCKING
/*
* Look up a dependency chain. If the key is not present yet then
* add it and return 1 - in this case the new dependency chain is
@@ -1381,6 +1391,7 @@
return 1;
}
+#endif
/*
* We are building curr_chain_key incrementally, so double-check