Merge "sched: Move upmigrate, downmigrate and boost tunables out of SCHED_DEBUG"

This commit is contained in:
Linux Build Service Account 2018-01-13 04:00:45 -08:00 • committed by Gerrit - the friendly Code Review server
commit 5e9798081a

View file

@ -314,7 +314,30 @@ static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &sysctl_sched_group_upmigrate_pct,
},
{
.procname = "sched_boost",
.data = &sysctl_sched_boost,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_boost_handler,
.extra1 = &zero,
.extra2 = &three,
},
#endif
{
.procname = "sched_upmigrate",
.data = &sysctl_sched_capacity_margin,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_updown_migrate_handler,
},
{
.procname = "sched_downmigrate",
.data = &sysctl_sched_capacity_margin_down,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_updown_migrate_handler,
},
#ifdef CONFIG_SCHED_DEBUG
{
.procname = "sched_min_granularity_ns",
@ -356,15 +379,6 @@ static struct ctl_table kern_table[] = {
.mode = 0644,
.proc_handler = proc_dointvec,
},
{
.procname = "sched_boost",
.data = &sysctl_sched_boost,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_boost_handler,
.extra1 = &zero,
.extra2 = &three,
},
#endif
{
.procname = "sched_initial_task_util",
@ -389,20 +403,6 @@ static struct ctl_table kern_table[] = {
.extra1 = &min_wakeup_granularity_ns,
.extra2 = &max_wakeup_granularity_ns,
},
{
.procname = "sched_upmigrate",
.data = &sysctl_sched_capacity_margin,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_updown_migrate_handler,
},
{
.procname = "sched_downmigrate",
.data = &sysctl_sched_capacity_margin_down,
.maxlen = sizeof(unsigned int),
.mode = 0644,
.proc_handler = sched_updown_migrate_handler,
},
#ifdef CONFIG_SMP
{
.procname = "sched_tunable_scaling",