From ebcedaf49432b8f5eb09cc530128436198dddbed Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 16 Sep 2009 13:47:58 +0200 Subject: [PATCH] --- yaml --- r: 163021 b: refs/heads/master c: 5a9b86f647a56862cdc0a1362bfb015ae921af7f h: refs/heads/master i: 163019: 9e235b92cd7bf35bff2448aeaca16cd3b9e59f44 v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a0db42efbdf4..461cc90d7eed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5158f4e4428c6b8d52796b3b460e95796123a114 +refs/heads/master: 5a9b86f647a56862cdc0a1362bfb015ae921af7f diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index aeff40e7ec1b..c741cd9d38de 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -1551,12 +1551,12 @@ static void set_next_buddy(struct sched_entity *se) /* * Preempt the current task with a newly woken task if needed: */ -static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int flags) +static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_flags) { struct task_struct *curr = rq->curr; struct sched_entity *se = &curr->se, *pse = &p->se; struct cfs_rq *cfs_rq = task_cfs_rq(curr); - int sync = flags & WF_SYNC; + int sync = wake_flags & WF_SYNC; update_curr(cfs_rq); @@ -1582,7 +1582,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int flags */ if (sched_feat(LAST_BUDDY) && likely(se->on_rq && curr != rq->idle)) set_last_buddy(se); - if (sched_feat(NEXT_BUDDY) && !(flags & WF_FORK)) + if (sched_feat(NEXT_BUDDY) && !(wake_flags & WF_FORK)) set_next_buddy(pse); /*