diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-08 12:46:25 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-03-02 19:38:17 -0500 |
| commit | 4b2d00c71110e4fea30ba09cd2e370f7ad2bad8f (patch) | |
| tree | bc8b15ff746e3da32cb28832b23a1a27b1d9004c | |
| parent | 7349c30941963f59b46b021e1fd4391eb1ba33c7 (diff) | |
| download | rt-patches-4b2d00c71110e4fea30ba09cd2e370f7ad2bad8f.tar.gz | |
rm sched-Fix-pick_next_highest_task_rt-for-cgroups.patch ; now upstr.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | sched-Fix-pick_next_highest_task_rt-for-cgroups.patch | 40 | ||||
| -rw-r--r-- | series | 1 |
2 files changed, 0 insertions, 41 deletions
diff --git a/sched-Fix-pick_next_highest_task_rt-for-cgroups.patch b/sched-Fix-pick_next_highest_task_rt-for-cgroups.patch deleted file mode 100644 index 08b67ef..0000000 --- a/sched-Fix-pick_next_highest_task_rt-for-cgroups.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 318e45ed545c213617c9fc9a336893d7ee9fd55b Mon Sep 17 00:00:00 2001 -From: Peter Zijlstra <a.p.zijlstra@chello.nl> -Date: Wed, 10 Mar 2010 17:07:24 +0100 -Subject: [PATCH] sched: Fix pick_next_highest_task_rt() for cgroups - -commit 318e45ed545c213617c9fc9a336893d7ee9fd55b in tip. - -Upstream commit: 3d07467b7aa91623b31d7b5888a123a2c8c8e9cc - -Since pick_next_highest_task_rt() already iterates all the cgroups and -is really only interested in tasks, skip over the !task entries. - -Reported-by: Dhaval Giani <dhaval.giani@gmail.com> -Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> -Tested-by: Dhaval Giani <dhaval.giani@gmail.com> -LKML-Reference: <new-submission> -Signed-off-by: Ingo Molnar <mingo@elte.hu> -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> - -diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c -index 9de5f18..6a0029a 100644 ---- a/kernel/sched_rt.c -+++ b/kernel/sched_rt.c -@@ -1207,7 +1207,12 @@ static struct task_struct *pick_next_highest_task_rt(struct rq *rq, int cpu) - if (next && next->prio < idx) - continue; - list_for_each_entry(rt_se, array->queue + idx, run_list) { -- struct task_struct *p = rt_task_of(rt_se); -+ struct task_struct *p; -+ -+ if (!rt_entity_is_task(rt_se)) -+ continue; -+ -+ p = rt_task_of(rt_se); - if (pick_rt_task(rq, p, cpu)) { - next = p; - break; --- -1.7.1.1 - @@ -392,7 +392,6 @@ sched-Break-out-from-load_balancing-on-rq_lock-conte.patch # v2.6.33-rt8.patch # v2.6.33.1-rt9.patch # v2.6.33.1-rt10.patch -sched-Fix-pick_next_highest_task_rt-for-cgroups.patch # v2.6.33.1-rt11.patch net-gianfar-Make-RT-aware.patch x86-Fix-irq-off-tracing-for-32-bit.patch |