From a33186663956743ab9a95ada0e38dd1f7e200111 Mon Sep 17 00:00:00 2001
From: Dave Young <hidave.darkstar@gmail.com>
Date: Wed, 10 Mar 2010 15:24:10 -0800
Subject: [PATCH] --- yaml --- r: 187319 b: refs/heads/master c:
 2edf5e49800846a2b2b6461d99cdae18067c440f h: refs/heads/master i:   187317:
 56bc763521b11f7c1ac9dddeb5600de254524002   187315:
 d8b5d39cb99103c0a34cfe7ae4ed59e5e57cd166   187311:
 d66bd0db69dde0f2a181996cf33c4f933bf47f79 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/lockdep.h | 4 ++++
 trunk/kernel/sysctl.c         | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 2b3748ca8a2f..171aae4e15a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f0e056fdebc15d3f4724ebc7bbf323158add1d7
+refs/heads/master: 2edf5e49800846a2b2b6461d99cdae18067c440f
diff --git a/trunk/include/linux/lockdep.h b/trunk/include/linux/lockdep.h
index 10206a87da19..a03977a96d7e 100644
--- a/trunk/include/linux/lockdep.h
+++ b/trunk/include/linux/lockdep.h
@@ -12,6 +12,10 @@
 struct task_struct;
 struct lockdep_map;
 
+/* for sysctl */
+extern int prove_locking;
+extern int lock_stat;
+
 #ifdef CONFIG_LOCKDEP
 
 #include <linux/linkage.h>
diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c
index 622029ba5103..8686b0f5fc12 100644
--- a/trunk/kernel/sysctl.c
+++ b/trunk/kernel/sysctl.c
@@ -67,6 +67,9 @@
 #ifdef CONFIG_RT_MUTEXES
 #include <linux/rtmutex.h>
 #endif
+#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
+#include <linux/lockdep.h>
+#endif
 #ifdef CONFIG_CHR_DEV_SG
 #include <scsi/sg.h>
 #endif
@@ -191,9 +194,6 @@ extern struct ctl_table epoll_table[];
 int sysctl_legacy_va_layout;
 #endif
 
-extern int prove_locking;
-extern int lock_stat;
-
 /* The default sysctl tables: */
 
 static struct ctl_table root_table[] = {