diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-16 15:20:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-16 15:20:05 -0800 |
| commit | d33fdee4d090076462cfe25473f7139c3204b16e (patch) | |
| tree | 0b7cbabcd57b72baf0e5bbfa2ce97094a518adf0 /kernel/sched_stoptask.c | |
| parent | 1e8703b2e6aefba84dd9633d90a4093ff1200b93 (diff) | |
| parent | 1e5a74059f9059d330744eac84873b1b99657008 (diff) | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Fix cross-sched-class wakeup preemption
sched: Fix runnable condition for stoptask
sched: Use group weight, idle cpu metrics to fix imbalances during idle
Diffstat (limited to 'kernel/sched_stoptask.c')
| -rw-r--r-- | kernel/sched_stoptask.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/sched_stoptask.c b/kernel/sched_stoptask.c index 45bddc0c1048..2bf6b47058c1 100644 --- a/kernel/sched_stoptask.c +++ b/kernel/sched_stoptask.c @@ -19,14 +19,14 @@ select_task_rq_stop(struct rq *rq, struct task_struct *p, static void check_preempt_curr_stop(struct rq *rq, struct task_struct *p, int flags) { - resched_task(rq->curr); /* we preempt everything */ + /* we're never preempted */ } static struct task_struct *pick_next_task_stop(struct rq *rq) { struct task_struct *stop = rq->stop; - if (stop && stop->state == TASK_RUNNING) + if (stop && stop->se.on_rq) return stop; return NULL; |