Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 76165
b: refs/heads/master
c: c49443c
h: refs/heads/master
i:
  76163: 898dbb8
v: v3
  • Loading branch information
Gregory Haskins authored and Ingo Molnar committed Jan 25, 2008
1 parent fc45d98 commit 6138028
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 34 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cdc8eb984ce47a7c90a049f45229f7b0d59ba781
refs/heads/master: c49443c538c1bbf50eda27e4a3711e9fc15176b0
33 changes: 0 additions & 33 deletions trunk/kernel/sched_rt.c
Original file line number Diff line number Diff line change
Expand Up @@ -586,38 +586,6 @@ static int pull_rt_task(struct rq *this_rq)
continue;

src_rq = cpu_rq(cpu);
if (unlikely(src_rq->rt.rt_nr_running <= 1)) {
/*
* It is possible that overlapping cpusets
* will miss clearing a non overloaded runqueue.
* Clear it now.
*/
if (double_lock_balance(this_rq, src_rq)) {
/* unlocked our runqueue lock */
struct task_struct *old_next = next;

next = pick_next_task_rt(this_rq);
if (next != old_next)
ret = 1;
}
if (likely(src_rq->rt.rt_nr_running <= 1)) {
/*
* Small chance that this_rq->curr changed
* but it's really harmless here.
*/
rt_clear_overload(this_rq);
} else {
/*
* Heh, the src_rq is now overloaded, since
* we already have the src_rq lock, go straight
* to pulling tasks from it.
*/
goto try_pulling;
}
spin_unlock(&src_rq->lock);
continue;
}

/*
* We can potentially drop this_rq's lock in
* double_lock_balance, and another CPU could
Expand All @@ -641,7 +609,6 @@ static int pull_rt_task(struct rq *this_rq)
continue;
}

try_pulling:
p = pick_next_highest_task_rt(src_rq, this_cpu);

/*
Expand Down

0 comments on commit 6138028

Please sign in to comment.