diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-20 11:01:29 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-20 11:01:29 +0200 |
| commit | d986434a7d32079cc6cbedcdb04d834aa9b323ff (patch) | |
| tree | cf1feb5139d76cef0446945b5cad741c47ae9d8d /kernel/sched_fair.c | |
| parent | sched: fix build error, provide partition_sched_domains() unconditionally (diff) | |
| parent | sched, x86: clean up hrtick implementation (diff) | |
| download | linux-d986434a7d32079cc6cbedcdb04d834aa9b323ff.tar.xz linux-d986434a7d32079cc6cbedcdb04d834aa9b323ff.zip | |
Merge branch 'sched/urgent' into sched/devel
Diffstat (limited to 'kernel/sched_fair.c')
| -rw-r--r-- | kernel/sched_fair.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index d924c679dfac..7f700263f04c 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -878,7 +878,6 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued) #ifdef CONFIG_SCHED_HRTICK static void hrtick_start_fair(struct rq *rq, struct task_struct *p) { - int requeue = rq->curr == p; struct sched_entity *se = &p->se; struct cfs_rq *cfs_rq = cfs_rq_of(se); @@ -899,10 +898,10 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p) * Don't schedule slices shorter than 10000ns, that just * doesn't make sense. Rely on vruntime for fairness. */ - if (!requeue) + if (rq->curr != p) delta = max(10000LL, delta); - hrtick_start(rq, delta, requeue); + hrtick_start(rq, delta); } } #else /* !CONFIG_SCHED_HRTICK */ |