From b3ec44cc802f31702423a0c3948a6e660f6c8350 Mon Sep 17 00:00:00 2001 From: Wang Chen Date: Mon, 2 Mar 2009 13:55:26 +0800 Subject: [PATCH] --- yaml --- r: 135698 b: refs/heads/master c: b67802ea8061393f7bd2d4db934646e76096027c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 55288e01fd12..bdcfdb7b694b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72fd455ba54b5a02b9c74221b9ded8b1845b464a +refs/heads/master: b67802ea8061393f7bd2d4db934646e76096027c diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index dfae1bf6d5b2..9fe8e17574af 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -4603,7 +4603,7 @@ static inline void schedule_debug(struct task_struct *prev) * Pick up the highest-prio task: */ static inline struct task_struct * -pick_next_task(struct rq *rq, struct task_struct *prev) +pick_next_task(struct rq *rq) { const struct sched_class *class; struct task_struct *p; @@ -4678,7 +4678,7 @@ asmlinkage void __sched schedule(void) idle_balance(cpu, rq); prev->sched_class->put_prev_task(rq, prev); - next = pick_next_task(rq, prev); + next = pick_next_task(rq); if (likely(prev != next)) { sched_info_switch(prev, next); @@ -6514,7 +6514,7 @@ static void migrate_dead_tasks(unsigned int dead_cpu) if (!rq->nr_running) break; update_rq_clock(rq); - next = pick_next_task(rq, rq->curr); + next = pick_next_task(rq); if (!next) break; next->sched_class->put_prev_task(rq, next);