From 041c7ba5b57ca77c5f5d4051c6ede1e27b8a769e Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Tue, 19 Aug 2008 12:33:03 +0200 Subject: [PATCH] --- yaml --- r: 109306 b: refs/heads/master c: cc2991cf15ae92fa30b3ea9f56a8a5a337bd33c7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched_rt.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 771c5d2a5045..fa8ee49de296 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f3ade837808121ff8bab9c56725f4fe40ec85a56 +refs/heads/master: cc2991cf15ae92fa30b3ea9f56a8a5a337bd33c7 diff --git a/trunk/kernel/sched_rt.c b/trunk/kernel/sched_rt.c index 07d9b3307907..552310798dad 100644 --- a/trunk/kernel/sched_rt.c +++ b/trunk/kernel/sched_rt.c @@ -440,9 +440,6 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq) { u64 runtime = sched_rt_runtime(rt_rq); - if (runtime == RUNTIME_INF) - return 0; - if (rt_rq->rt_throttled) return rt_rq_throttled(rt_rq); @@ -493,9 +490,11 @@ static void update_curr_rt(struct rq *rq) rt_rq = rt_rq_of_se(rt_se); spin_lock(&rt_rq->rt_runtime_lock); - rt_rq->rt_time += delta_exec; - if (sched_rt_runtime_exceeded(rt_rq)) - resched_task(curr); + if (sched_rt_runtime(rt_rq) != RUNTIME_INF) { + rt_rq->rt_time += delta_exec; + if (sched_rt_runtime_exceeded(rt_rq)) + resched_task(curr); + } spin_unlock(&rt_rq->rt_runtime_lock); } }