diff options
| author | Vandana Salve <vsalve@nvidia.com> | 2011-10-18 15:20:07 +0530 |
|---|---|---|
| committer | Ryan Wong <ryanw@nvidia.com> | 2011-10-20 13:39:14 -0700 |
| commit | 81c9154dad92e72da9199ab20dd7e3874c3359a3 (patch) | |
| tree | ef7f4b6d671871256fc27491ae3f168f6f4aee0a /kernel/sched_fair.c | |
| parent | 9684358fc71e009141d8c09f8c95c03ea8814a06 (diff) | |
sched: Fix cross-sched-class wakeup preemption
Instead of dealing with sched classes inside each check_preempt_curr()
implementation, pull out this logic into the generic wakeup preemption
path.
Manually applied the partial patch set from
http://www.spinics.net/lists/kvm-commits/msg00039.html and
cross-refernce'd the k39 kernel
Bug 886798
Change-Id: Ib5bb12eec6c276ded9231e9ed2238499d42e31da
Reviewed-on: http://git-master/r/59405
Reviewed-by: Ryan Wong <ryanw@nvidia.com>
Tested-by: Ryan Wong <ryanw@nvidia.com>
Diffstat (limited to 'kernel/sched_fair.c')
| -rw-r--r-- | kernel/sched_fair.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 1bb879013173..b8ae4e51b46d 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -1658,12 +1658,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_ struct cfs_rq *cfs_rq = task_cfs_rq(curr); int scale = cfs_rq->nr_running >= sched_nr_latency; - if (unlikely(rt_prio(p->prio))) - goto preempt; - - if (unlikely(p->sched_class != &fair_sched_class)) - return; - if (unlikely(se == pse)) return; |