diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-01-25 21:08:15 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-25 21:08:15 +0100 |
commit | 4df64c0bfb7e0e260d10ebc005f7d0ba1308eed7 (patch) | |
tree | 51ffd9e80f38e6c918e57f33373ac400bd403c53 /kernel/sched_rt.c | |
parent | sched: clean up pick_next_highest_task_rt() (diff) | |
download | linux-4df64c0bfb7e0e260d10ebc005f7d0ba1308eed7.tar.xz linux-4df64c0bfb7e0e260d10ebc005f7d0ba1308eed7.zip |
sched: clean up find_lock_lowest_rq()
clean up find_lock_lowest_rq().
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched_rt.c')
-rw-r--r-- | kernel/sched_rt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index b8435fd47f78..0749c1837b10 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c @@ -438,12 +438,11 @@ static int find_lowest_rq(struct task_struct *task) } /* Will lock the rq it finds */ -static struct rq *find_lock_lowest_rq(struct task_struct *task, - struct rq *rq) +static struct rq *find_lock_lowest_rq(struct task_struct *task, struct rq *rq) { struct rq *lowest_rq = NULL; - int cpu; int tries; + int cpu; for (tries = 0; tries < RT_MAX_TRIES; tries++) { cpu = find_lowest_rq(task); @@ -462,9 +461,11 @@ static struct rq *find_lock_lowest_rq(struct task_struct *task, * Also make sure that it wasn't scheduled on its rq. */ if (unlikely(task_rq(task) != rq || - !cpu_isset(lowest_rq->cpu, task->cpus_allowed) || + !cpu_isset(lowest_rq->cpu, + task->cpus_allowed) || task_running(rq, task) || !task->se.on_rq)) { + spin_unlock(&lowest_rq->lock); lowest_rq = NULL; break; |