diff --git a/[refs] b/[refs] index 1488e0ae0b51..2b3748ca8a2f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c55b7c3e82d0ad58f35a0785faaaf2f70b9b6cd3 +refs/heads/master: 4f0e056fdebc15d3f4724ebc7bbf323158add1d7 diff --git a/trunk/include/linux/rtmutex.h b/trunk/include/linux/rtmutex.h index 281d8fd775e8..8d522ffeda33 100644 --- a/trunk/include/linux/rtmutex.h +++ b/trunk/include/linux/rtmutex.h @@ -16,6 +16,8 @@ #include #include +extern int max_lock_depth; /* for sysctl */ + /** * The rt_mutex structure * diff --git a/trunk/kernel/sysctl.c b/trunk/kernel/sysctl.c index 7635bb15f5af..622029ba5103 100644 --- a/trunk/kernel/sysctl.c +++ b/trunk/kernel/sysctl.c @@ -64,6 +64,9 @@ #ifdef CONFIG_BSD_PROCESS_ACCT #include #endif +#ifdef CONFIG_RT_MUTEXES +#include +#endif #ifdef CONFIG_CHR_DEV_SG #include #endif @@ -150,10 +153,6 @@ extern int unaligned_dump_stack; extern struct ratelimit_state printk_ratelimit_state; -#ifdef CONFIG_RT_MUTEXES -extern int max_lock_depth; -#endif - #ifdef CONFIG_PROC_SYSCTL static int proc_do_cad_pid(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos);