summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2009-09-16 13:47:58 +0200
committerIngo Molnar <mingo@elte.hu>2009-09-16 16:44:33 +0200
commit5a9b86f647a56862cdc0a1362bfb015ae921af7f (patch)
tree656652186f9f5198e73139f6362afd7b6584eca1
parent5158f4e4428c6b8d52796b3b460e95796123a114 (diff)
downloadkernel-common-5a9b86f647a56862cdc0a1362bfb015ae921af7f.tar.gz
kernel-common-5a9b86f647a56862cdc0a1362bfb015ae921af7f.tar.bz2
kernel-common-5a9b86f647a56862cdc0a1362bfb015ae921af7f.zip
sched: Rename flags to wake_flags
For consistencies sake, rename the argument (again). Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/sched_fair.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index aeff40e7ec1b..c741cd9d38de 100644
--- a/kernel/sched_fair.c
+++ b/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);
/*