Commit f1b4f23a authored by Joel Granados's avatar Joel Granados
Browse files

locking/rtmutex: Move max_lock_depth into rtmutex.c 



Move the max_lock_depth sysctl table element into rtmutex_api.c. Removed
the rtmutex.h include from sysctl.c. Chose to move into rtmutex_api.c
to avoid multiple registrations every time rtmutex.c is included in other
files.

This is part of a greater effort to move ctl tables into their
respective subsystems which will reduce the merge conflicts in
kernel/sysctl.c.

Signed-off-by: default avatarJoel Granados <joel.granados@kernel.org>
parent d0d05f60

include/linux/rtmutex.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/rbtree_types.h>

#include <linux/spinlock_types_raw.h>



extern int max_lock_depth; /* for sysctl */

extern int max_lock_depth;



struct rt_mutex_base {

	raw_spinlock_t		wait_lock;

kernel/locking/rtmutex_api.c

+18 −0
Original line number Diff line number Diff line
@@ -13,6 +13,24 @@ 
 */

int max_lock_depth = 1024;



static const struct ctl_table rtmutex_sysctl_table[] = {

	{

		.procname	= "max_lock_depth",

		.data		= &max_lock_depth,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

};



static int __init init_rtmutex_sysctl(void)

{

	register_sysctl_init("kernel", rtmutex_sysctl_table);

	return 0;

}



subsys_initcall(init_rtmutex_sysctl);



/*

 * Debug aware fast / slowpath lock,trylock,unlock

 *

kernel/sysctl.c

+0 −12
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ 
#include <asm/nmi.h>

#include <asm/io.h>

#endif

#ifdef CONFIG_RT_MUTEXES

#include <linux/rtmutex.h>

#endif



/* shared constants to be used in various sysctls */

const int sysctl_vals[] = { 0, 1, 2, 3, 4, 100, 200, 1000, 3000, INT_MAX, 65535, -1 };
@@ -1709,15 +1706,6 @@ static const struct ctl_table kern_table[] = { 
		.proc_handler	= proc_dointvec,

	},

#endif

#ifdef CONFIG_RT_MUTEXES

	{

		.procname	= "max_lock_depth",

		.data		= &max_lock_depth,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec,

	},

#endif

#ifdef CONFIG_TREE_RCU

	{

		.procname	= "panic_on_rcu_stall",