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

sched: Move energy_aware sysctls to topology.c 



move energy_aware sysctls to topology.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 d4ae80ff

include/linux/sched/sysctl.h

+0 −6
Original line number Diff line number Diff line
@@ -34,10 +34,4 @@ extern int sysctl_numa_balancing_mode; 
int sysctl_numa_balancing(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;

int sched_energy_aware_handler(struct ctl_table *table, int write,

		void *buffer, size_t *lenp, loff_t *ppos);

#endif



#endif /* _LINUX_SCHED_SYSCTL_H */

kernel/sched/topology.c

+23 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent) 


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

DEFINE_STATIC_KEY_FALSE(sched_energy_present);

unsigned int sysctl_sched_energy_aware = 1;

static unsigned int sysctl_sched_energy_aware = 1;

DEFINE_MUTEX(sched_energy_mutex);

bool sched_energy_update;
@@ -220,7 +220,7 @@ void rebuild_sched_domains_energy(void) 
}



#ifdef CONFIG_PROC_SYSCTL

int sched_energy_aware_handler(struct ctl_table *table, int write,

static int sched_energy_aware_handler(struct ctl_table *table, int write,

		void *buffer, size_t *lenp, loff_t *ppos)

{

	int ret, state;
@@ -237,6 +237,27 @@ int sched_energy_aware_handler(struct ctl_table *table, int write, 


	return ret;

}



static struct ctl_table sched_energy_aware_sysctls[] = {

	{

		.procname       = "sched_energy_aware",

		.data           = &sysctl_sched_energy_aware,

		.maxlen         = sizeof(unsigned int),

		.mode           = 0644,

		.proc_handler   = sched_energy_aware_handler,

		.extra1         = SYSCTL_ZERO,

		.extra2         = SYSCTL_ONE,

	},

	{}

};



static int __init sched_energy_aware_sysctl_init(void)

{

	register_sysctl_init("kernel", sched_energy_aware_sysctls);

	return 0;

}



late_initcall(sched_energy_aware_sysctl_init);

#endif



static void free_pd(struct perf_domain *pd)

kernel/sysctl.c

+0 −11
Original line number Diff line number Diff line
@@ -1681,17 +1681,6 @@ static struct ctl_table kern_table[] = { 
		.extra2		= SYSCTL_FOUR,

	},

#endif /* CONFIG_NUMA_BALANCING */

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

	{

		.procname	= "sched_energy_aware",

		.data		= &sysctl_sched_energy_aware,

		.maxlen		= sizeof(unsigned int),

		.mode		= 0644,

		.proc_handler	= sched_energy_aware_handler,

		.extra1		= SYSCTL_ZERO,

		.extra2		= SYSCTL_ONE,

	},

#endif

#ifdef CONFIG_PROVE_LOCKING

	{

		.procname	= "prove_locking",