sched/core: Kill sched_class::task_waking to clean up the migration logic

[sfrench/cifs-2.6.git] / kernel / sched / core.c

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 1f73e2554bc109683c210fb24b75d77a2a72e581..636c4b9cac38037a08407f7bf96faac2427825af 100644 (file)
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -1717,11 +1717,8 @@ ttwu_do_activate(struct rq *rq, struct task_struct *p, int wake_flags,
        if (p->sched_contributes_to_load)
                rq->nr_uninterruptible--;
 
-       /*
-        * If we migrated; we must have called sched_class::task_waking().
-        */
        if (wake_flags & WF_MIGRATED)
-               en_flags |= ENQUEUE_WAKING;
+               en_flags |= ENQUEUE_MIGRATED;
 #endif
 
        ttwu_activate(rq, p, en_flags);
@@ -2049,10 +2046,6 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
        cpu = select_task_rq(p, p->wake_cpu, SD_BALANCE_WAKE, wake_flags);
        if (task_cpu(p) != cpu) {
                wake_flags |= WF_MIGRATED;
-
-               if (p->sched_class->task_waking)
-                       p->sched_class->task_waking(p);
-
                set_task_cpu(p, cpu);
        }
 #endif /* CONFIG_SMP */