Merge commit 'v2.6.26-rc9' into sched/devel

1 files changed, 4 insertions, 0 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 996bc15196a5..827c1b416da6 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -6075,6 +6075,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);
 
         }
@@ -8755,6 +8756,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);
 }