Commit f5ef06d5 authored by Zhen Ni's avatar Zhen Ni Committed by Luis Chamberlain
Browse files

sched: Move schedstats sysctls to core.c 



move schedstats sysctls to core.c and use the new
register_sysctl_init() to register the sysctl interface.

Signed-off-by: default avatarZhen Ni <nizhen@uniontech.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent a60707d7

include/linux/sched/sysctl.h

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ int sysctl_sched_uclamp_handler(struct ctl_table *table, int write, 
		void *buffer, size_t *lenp, loff_t *ppos);

int sysctl_numa_balancing(struct ctl_table *table, int write, void *buffer,

		size_t *lenp, loff_t *ppos);

int sysctl_schedstats(struct ctl_table *table, int write, void *buffer,

		size_t *lenp, loff_t *ppos);



#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL)

extern unsigned int sysctl_sched_energy_aware;

kernel/sched/core.c

+21 −1
Original line number Diff line number Diff line
@@ -4430,7 +4430,7 @@ static int __init setup_schedstats(char *str) 
__setup("schedstats=", setup_schedstats);



#ifdef CONFIG_PROC_SYSCTL

int sysctl_schedstats(struct ctl_table *table, int write, void *buffer,

static int sysctl_schedstats(struct ctl_table *table, int write, void *buffer,

		size_t *lenp, loff_t *ppos)

{

	struct ctl_table t;
@@ -4449,6 +4449,26 @@ int sysctl_schedstats(struct ctl_table *table, int write, void *buffer, 
		set_schedstats(state);

	return err;

}



static struct ctl_table sched_schedstats_sysctls[] = {

	{

		.procname       = "sched_schedstats",

		.data           = NULL,

		.maxlen         = sizeof(unsigned int),

		.mode           = 0644,

		.proc_handler   = sysctl_schedstats,

		.extra1         = SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE,

	},

	{}

};



static int __init sched_schedstats_sysctl_init(void)

{

	register_sysctl_init("kernel", sched_schedstats_sysctls);

	return 0;

}

late_initcall(sched_schedstats_sysctl_init);

#endif /* CONFIG_PROC_SYSCTL */

#endif /* CONFIG_SCHEDSTATS */

kernel/sysctl.c

+0 −11
Original line number Diff line number Diff line
@@ -1659,17 +1659,6 @@ int proc_do_static_key(struct ctl_table *table, int write, 
}



static struct ctl_table kern_table[] = {

#ifdef CONFIG_SCHEDSTATS

	{

		.procname	= "sched_schedstats",

		.data		= NULL,

		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= sysctl_schedstats,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

#endif /* CONFIG_SCHEDSTATS */

#ifdef CONFIG_TASK_DELAY_ACCT

	{

		.procname	= "task_delayacct",