diff --git a/[refs] b/[refs]
index f0c2f231fb2e..8c24de8319c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 368059a977871def0f88a92eefb6ecc1f7b6132f
+refs/heads/master: 2ddbf952508fb9911036c484a87f6351106b917c
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 36484da963f9..cd2b4942fe35 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -1663,6 +1663,8 @@ void sched_fork(struct task_struct *p, int clone_flags)
 	 * Make sure we do not leak PI boosting priority to the child:
 	 */
 	p->prio = current->normal_prio;
+	if (!rt_prio(p->prio))
+		p->sched_class = &fair_sched_class;
 
 #if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)
 	if (likely(sched_info_on()))
@@ -1698,11 +1700,6 @@ void fastcall wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
 
 	p->prio = effective_prio(p);
 
-	if (rt_prio(p->prio))
-		p->sched_class = &rt_sched_class;
-	else
-		p->sched_class = &fair_sched_class;
-
 	if (task_cpu(p) != this_cpu || !p->sched_class->task_new ||
 							!current->se.on_rq) {
 		activate_task(rq, p, 0);