]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
sched/core: Fix sched_rt_global_validate
authorJuri Lelli <juri.lelli@gmail.com>
Tue, 11 Feb 2014 08:24:26 +0000 (09:24 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 21 Feb 2014 20:27:10 +0000 (21:27 +0100)
Don't compare sysctl_sched_rt_runtime against sysctl_sched_rt_period if
the former is equal to RUNTIME_INF, otherwise disabling -rt bandwidth
management (with CONFIG_RT_GROUP_SCHED=n) fails.

Cc: Ingo Molnar <mingo@redhat.com>
Signed-off-by: Juri Lelli <juri.lelli@gmail.com>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1392107067-19907-2-git-send-email-juri.lelli@gmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
kernel/sched/core.c

index 24914488da4156500cf7cdf8b96c298cdb44119e..98d33c105252500cf1064b6672ab02be88321cad 100644 (file)
@@ -7475,7 +7475,8 @@ static int sched_rt_global_validate(void)
        if (sysctl_sched_rt_period <= 0)
                return -EINVAL;
 
-       if (sysctl_sched_rt_runtime > sysctl_sched_rt_period)
+       if ((sysctl_sched_rt_runtime != RUNTIME_INF) &&
+               (sysctl_sched_rt_runtime > sysctl_sched_rt_period))
                return -EINVAL;
 
        return 0;