diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-26 03:24:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-26 03:24:23 -0400 |
| commit | 9a13150109fb418c50fa400c012f90d0ce6f67c3 (patch) | |
| tree | 237d8ee3b8b87984776b5aa0f05b92f84d372a1d /kernel/sched_rt.c | |
| parent | 3ccf79f4570acacfefc51772e8f9207895b35ad7 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge commit 'v2.6.26-rc8' into core/rcu
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 1dad5bbb59b6..0f3c19197fa4 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
| @@ -250,7 +250,8 @@ static int do_sched_rt_period_timer(struct rt_bandwidth *rt_b, int overrun) | |||
| 250 | if (rt_rq->rt_time || rt_rq->rt_nr_running) | 250 | if (rt_rq->rt_time || rt_rq->rt_nr_running) |
| 251 | idle = 0; | 251 | idle = 0; |
| 252 | spin_unlock(&rt_rq->rt_runtime_lock); | 252 | spin_unlock(&rt_rq->rt_runtime_lock); |
| 253 | } | 253 | } else if (rt_rq->rt_nr_running) |
| 254 | idle = 0; | ||
| 254 | 255 | ||
| 255 | if (enqueue) | 256 | if (enqueue) |
| 256 | sched_rt_rq_enqueue(rt_rq); | 257 | sched_rt_rq_enqueue(rt_rq); |