Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175584
b: refs/heads/master
c: a65ac74
h: refs/heads/master
v: v3
  • Loading branch information
Jupyung Lee authored and Ingo Molnar committed Dec 9, 2009
1 parent 458168c commit d86d4a4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cd29fe6f2637cc2ccbda5ac65f5332d6bf5fa3c6
refs/heads/master: a65ac745e47e91f9d98dbf07f22ed0492e34d998
4 changes: 2 additions & 2 deletions trunk/kernel/sched_fair.c
Original file line number Diff line number Diff line change
Expand Up @@ -1651,8 +1651,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
int sync = wake_flags & WF_SYNC;
int scale = cfs_rq->nr_running >= sched_nr_latency;

update_curr(cfs_rq);

if (unlikely(rt_prio(p->prio))) {
resched_task(curr);
return;
Expand Down Expand Up @@ -1710,6 +1708,8 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_

BUG_ON(!pse);

update_curr(cfs_rq);

if (wakeup_preempt_entity(se, pse) == 1) {
resched_task(curr);
/*
Expand Down

0 comments on commit d86d4a4

Please sign in to comment.