diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-20 05:01:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-20 05:01:29 -0400 |
| commit | d986434a7d32079cc6cbedcdb04d834aa9b323ff (patch) | |
| tree | cf1feb5139d76cef0446945b5cad741c47ae9d8d /kernel/sched_rt.c | |
| parent | 1b427c153a08fdbc092c2bdbf845b92fda58d857 (diff) | |
| parent | 31656519e132f6612584815f128c83976a9aaaef (diff) | |
Merge branch 'sched/urgent' into sched/devel
Diffstat (limited to 'kernel/sched_rt.c')
| -rw-r--r-- | kernel/sched_rt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 50735bb96149..24621cea8bb0 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
| @@ -505,7 +505,9 @@ void inc_rt_tasks(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) | |||
| 505 | rt_rq->rt_nr_running++; | 505 | rt_rq->rt_nr_running++; |
| 506 | #if defined CONFIG_SMP || defined CONFIG_RT_GROUP_SCHED | 506 | #if defined CONFIG_SMP || defined CONFIG_RT_GROUP_SCHED |
| 507 | if (rt_se_prio(rt_se) < rt_rq->highest_prio) { | 507 | if (rt_se_prio(rt_se) < rt_rq->highest_prio) { |
| 508 | #ifdef CONFIG_SMP | ||
| 508 | struct rq *rq = rq_of_rt_rq(rt_rq); | 509 | struct rq *rq = rq_of_rt_rq(rt_rq); |
| 510 | #endif | ||
| 509 | 511 | ||
| 510 | rt_rq->highest_prio = rt_se_prio(rt_se); | 512 | rt_rq->highest_prio = rt_se_prio(rt_se); |
| 511 | #ifdef CONFIG_SMP | 513 | #ifdef CONFIG_SMP |