Merge branch 'tracing/ftrace' into auto-ftrace-next

[h-e-n] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index 1ffa768..42899dc 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5938,6 +5938,7 @@ static void migrate_dead_tasks(unsigned int dead_cpu)
                next = pick_next_task(rq, rq->curr);
                if (!next)
                        break;
+               next->sched_class->put_prev_task(rq, next);
                migrate_dead(dead_cpu, next);
 
        }
@@ -8552,6 +8553,9 @@ int sched_group_set_rt_period(struct task_group *tg, long rt_period_us)
        rt_period = (u64)rt_period_us * NSEC_PER_USEC;
        rt_runtime = tg->rt_bandwidth.rt_runtime;
 
+       if (rt_period == 0)
+               return -EINVAL;
+
        return tg_set_bandwidth(tg, rt_period, rt_runtime);
 }