diff options
author | Dave Young <hidave.darkstar@gmail.com> | 2010-03-10 18:24:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:53:10 -0500 |
commit | 4f0e056fdebc15d3f4724ebc7bbf323158add1d7 (patch) | |
tree | 79823a3e71a696fa9d4148a2ad0709c5deb07805 | |
parent | c55b7c3e82d0ad58f35a0785faaaf2f70b9b6cd3 (diff) |
sysctl extern cleanup: rtmutex
Extern declarations in sysctl.c should be moved to their own header file,
and then include them in relavant .c files.
Move max_lock_depth extern declaration to linux/rtmutex.h
Signed-off-by: Dave Young <hidave.darkstar@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/rtmutex.h | 2 | ||||
-rw-r--r-- | kernel/sysctl.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h index 281d8fd775e8..8d522ffeda33 100644 --- a/include/linux/rtmutex.h +++ b/include/linux/rtmutex.h | |||
@@ -16,6 +16,8 @@ | |||
16 | #include <linux/plist.h> | 16 | #include <linux/plist.h> |
17 | #include <linux/spinlock_types.h> | 17 | #include <linux/spinlock_types.h> |
18 | 18 | ||
19 | extern int max_lock_depth; /* for sysctl */ | ||
20 | |||
19 | /** | 21 | /** |
20 | * The rt_mutex structure | 22 | * The rt_mutex structure |
21 | * | 23 | * |
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 7635bb15f5af..622029ba5103 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c | |||
@@ -64,6 +64,9 @@ | |||
64 | #ifdef CONFIG_BSD_PROCESS_ACCT | 64 | #ifdef CONFIG_BSD_PROCESS_ACCT |
65 | #include <linux/acct.h> | 65 | #include <linux/acct.h> |
66 | #endif | 66 | #endif |
67 | #ifdef CONFIG_RT_MUTEXES | ||
68 | #include <linux/rtmutex.h> | ||
69 | #endif | ||
67 | #ifdef CONFIG_CHR_DEV_SG | 70 | #ifdef CONFIG_CHR_DEV_SG |
68 | #include <scsi/sg.h> | 71 | #include <scsi/sg.h> |
69 | #endif | 72 | #endif |
@@ -150,10 +153,6 @@ extern int unaligned_dump_stack; | |||
150 | 153 | ||
151 | extern struct ratelimit_state printk_ratelimit_state; | 154 | extern struct ratelimit_state printk_ratelimit_state; |
152 | 155 | ||
153 | #ifdef CONFIG_RT_MUTEXES | ||
154 | extern int max_lock_depth; | ||
155 | #endif | ||
156 | |||
157 | #ifdef CONFIG_PROC_SYSCTL | 156 | #ifdef CONFIG_PROC_SYSCTL |
158 | static int proc_do_cad_pid(struct ctl_table *table, int write, | 157 | static int proc_do_cad_pid(struct ctl_table *table, int write, |
159 | void __user *buffer, size_t *lenp, loff_t *ppos); | 158 | void __user *buffer, size_t *lenp, loff_t *ppos); |