From: Gregory Haskins <[EMAIL PROTECTED]>
We had support for overlapping cpuset based rto logic in early prototypes that
is no longer used, so clean it up.
Signed-off-by: Gregory Haskins <[EMAIL PROTECTED]>
Signed-off-by: Steven Rostedt <[EMAIL PROTECTED]>
---
kernel/sched_rt.c | 33 ---------------------------------
1 file changed, 33 deletions(-)
Index: linux-sched/kernel/sched_rt.c
===================================================================
--- linux-sched.orig/kernel/sched_rt.c 2007-12-10 20:39:19.000000000 -0500
+++ linux-sched/kernel/sched_rt.c 2007-12-10 20:39:21.000000000 -0500
@@ -586,38 +586,6 @@ static int pull_rt_task(struct rq *this_
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
@@ -641,7 +609,6 @@ static int pull_rt_task(struct rq *this_
continue;
}
- try_pulling:
p = pick_next_highest_task_rt(src_rq, this_cpu);
/*
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
