--- a/kernel/sched.c Fri Dec 24 15:35:24 2004 +++ b/kernel/sched.c Fri Dec 31 12:28:09 2004 @@ -580,11 +580,6 @@ static void enqueue_task(struct task_str p->array = array; } -/* - * Used by the migration code - we pull tasks from the head of the - * remote queue so we want these tasks to show up at the head of the - * local queue: - */ static inline void enqueue_task_head(struct task_struct *p, prio_array_t *array) { list_add(&p->run_list, array->queue + p->prio); @@ -2585,10 +2580,7 @@ need_resched_nonpreemptible: if (unlikely(current->flags & PF_DEAD)) current->state = EXIT_DEAD; - /* - * if entering off of a kernel preemption go straight - * to picking the next task. - */ + switch_count = &prev->nivcsw; if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) { switch_count = &prev->nvcsw;