aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2008-09-23 09:33:45 -0400
committerIngo Molnar <mingo@elte.hu>2008-09-23 10:23:17 -0400
commit57fdc26d4a734a3e00c6b2fc0e1e40ff8da4dc31 (patch)
tree912951e86391fc23f33981f88dce7cf374f136e1 /kernel
parent4653f803e6e0d970ffeac0efd2c01743eb6c5228 (diff)
sched: fixup buddy selection
We should set the buddy even though we might already have the TIF_RESCHED flag set. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched_fair.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 0c59da7e3120..e3f3c10f7033 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1249,6 +1249,8 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int sync)
1249 if (unlikely(se == pse)) 1249 if (unlikely(se == pse))
1250 return; 1250 return;
1251 1251
1252 cfs_rq_of(pse)->next = pse;
1253
1252 /* 1254 /*
1253 * We can come here with TIF_NEED_RESCHED already set from new task 1255 * We can come here with TIF_NEED_RESCHED already set from new task
1254 * wake up path. 1256 * wake up path.
@@ -1256,8 +1258,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int sync)
1256 if (test_tsk_need_resched(curr)) 1258 if (test_tsk_need_resched(curr))
1257 return; 1259 return;
1258 1260
1259 cfs_rq_of(pse)->next = pse;
1260
1261 /* 1261 /*
1262 * Batch tasks do not preempt (their preemption is driven by 1262 * Batch tasks do not preempt (their preemption is driven by
1263 * the tick): 1263 * the tick):