diff --git a/[refs] b/[refs] index a1c1739530b6..b4301192f871 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: baf25731e54d06eb13dc4eda78c6dc7da4ce84e8 +refs/heads/master: ec5d498991e87c74730509508b25c3959192b7e7 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index cc1f81b50b82..98890807375b 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -8909,6 +8909,9 @@ static int sched_rt_global_constraints(void) u64 rt_runtime, rt_period; int ret = 0; + if (sysctl_sched_rt_period <= 0) + return -EINVAL; + rt_period = ktime_to_ns(tg->rt_bandwidth.rt_period); rt_runtime = tg->rt_bandwidth.rt_runtime; @@ -8925,6 +8928,9 @@ static int sched_rt_global_constraints(void) unsigned long flags; int i; + if (sysctl_sched_rt_period <= 0) + return -EINVAL; + spin_lock_irqsave(&def_rt_bandwidth.rt_runtime_lock, flags); for_each_possible_cpu(i) { struct rt_rq *rt_rq = &cpu_rq(i)->rt;