aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/lockdep.h4
-rw-r--r--kernel/sysctl.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 10206a87da19..a03977a96d7e 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -12,6 +12,10 @@
12struct task_struct; 12struct task_struct;
13struct lockdep_map; 13struct lockdep_map;
14 14
15/* for sysctl */
16extern int prove_locking;
17extern int lock_stat;
18
15#ifdef CONFIG_LOCKDEP 19#ifdef CONFIG_LOCKDEP
16 20
17#include <linux/linkage.h> 21#include <linux/linkage.h>
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 622029ba5103..8686b0f5fc12 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -67,6 +67,9 @@
67#ifdef CONFIG_RT_MUTEXES 67#ifdef CONFIG_RT_MUTEXES
68#include <linux/rtmutex.h> 68#include <linux/rtmutex.h>
69#endif 69#endif
70#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
71#include <linux/lockdep.h>
72#endif
70#ifdef CONFIG_CHR_DEV_SG 73#ifdef CONFIG_CHR_DEV_SG
71#include <scsi/sg.h> 74#include <scsi/sg.h>
72#endif 75#endif
@@ -191,9 +194,6 @@ extern struct ctl_table epoll_table[];
191int sysctl_legacy_va_layout; 194int sysctl_legacy_va_layout;
192#endif 195#endif
193 196
194extern int prove_locking;
195extern int lock_stat;
196
197/* The default sysctl tables: */ 197/* The default sysctl tables: */
198 198
199static struct ctl_table root_table[] = { 199static struct ctl_table root_table[] = {