summaryrefslogtreecommitdiffstats
path: root/kernel/sched_rt.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-20 11:01:29 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-20 11:01:29 +0200
commitd986434a7d32079cc6cbedcdb04d834aa9b323ff (patch)
treecf1feb5139d76cef0446945b5cad741c47ae9d8d /kernel/sched_rt.c
parent1b427c153a08fdbc092c2bdbf845b92fda58d857 (diff)
parent31656519e132f6612584815f128c83976a9aaaef (diff)
downloadlinux-d986434a7d32079cc6cbedcdb04d834aa9b323ff.tar.gz
linux-d986434a7d32079cc6cbedcdb04d834aa9b323ff.tar.bz2
linux-d986434a7d32079cc6cbedcdb04d834aa9b323ff.zip
Merge branch 'sched/urgent' into sched/devel
Diffstat (limited to 'kernel/sched_rt.c')
-rw-r--r--kernel/sched_rt.c2
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)
rt_rq->rt_nr_running++;
#if defined CONFIG_SMP || defined CONFIG_RT_GROUP_SCHED
if (rt_se_prio(rt_se) < rt_rq->highest_prio) {
+#ifdef CONFIG_SMP
struct rq *rq = rq_of_rt_rq(rt_rq);
+#endif
rt_rq->highest_prio = rt_se_prio(rt_se);
#ifdef CONFIG_SMP