---

yaml --- r: 135701 b: refs/heads/master c: 7fc07d8 h: refs/heads/master i: 135699: e4a74ab v: v3
git-mirror · Mar 6, 2009 · 5cd63fc · 5cd63fc
1 parent dd0ba9f
commit 5cd63fc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 132 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a0be9ef8225638d26b455788f988c8f84ce9e75
+refs/heads/master: 7fc07d84108d54c5b94625c0e168f31b2d66976e
diff --git a/trunk/Documentation/scheduler/00-INDEX b/trunk/Documentation/scheduler/00-INDEX
@@ -2,8 +2,6 @@
 	- this file.
 sched-arch.txt
 	- CPU Scheduler implementation hints for architecture specific code.
-sched-coding.txt
-	- reference for various scheduler-related methods in the O(1) scheduler.
 sched-design-CFS.txt
 	- goals, design and implementation of the Complete Fair Scheduler.
 sched-domains.txt

diff --git a/trunk/Documentation/scheduler/sched-coding.txt b/trunk/Documentation/scheduler/sched-coding.txt
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -4610,7 +4610,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;
@@ -4685,7 +4685,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);
@@ -6521,7 +6521,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);