Merge branch into tip/master: 'sched/core'

* sched/core:
    f3dd3f674555 sched: Remove the limitation of WF_ON_CPU on wakelist if wakee cpu is idle
    28156108fecb sched: Fix the check of nr_running at queue wakelist
    792b9f65a568 sched: Allow newidle balancing to bail out of load_balance
    2ed81e765417 sched/deadline: Use proc_douintvec_minmax() limit minimum value
    51bf903b64bd sched/fair: Optimize and simplify rq leaf_cfs_rq_list
    f5b2eeb49991 sched/fair: Consider CPU affinity when allowing NUMA imbalance in find_idlest_group()
    026b98a93bbd sched/numa: Adjust imb_numa_nr to a better approximation of memory channels
    cb29a5c19d2d sched/numa: Apply imbalance limitations consistently
    13ede3315087 sched/numa: Do not swap tasks between nodes when spare capacity is available
    70ce3ea9aa4e sched/numa: Initialise numa_migrate_retry

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 2 deletions

diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index b5152961b743..5867e186c39a 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -30,14 +30,16 @@ static struct ctl_table sched_dl_sysctls[] = {
 		.data           = &sysctl_sched_dl_period_max,
 		.maxlen         = sizeof(unsigned int),
 		.mode           = 0644,
-		.proc_handler   = proc_dointvec,
+		.proc_handler   = proc_douintvec_minmax,
+		.extra1         = (void *)&sysctl_sched_dl_period_min,
 	},
 	{
 		.procname       = "sched_deadline_period_min_us",
 		.data           = &sysctl_sched_dl_period_min,
 		.maxlen         = sizeof(unsigned int),
 		.mode           = 0644,
-		.proc_handler   = proc_dointvec,
+		.proc_handler   = proc_douintvec_minmax,
+		.extra2         = (void *)&sysctl_sched_dl_period_max,
 	},
 	{}
 };