aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/sched.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 36484da963f9..cd2b4942fe35 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1663,6 +1663,8 @@ void sched_fork(struct task_struct *p, int clone_flags)
1663 * Make sure we do not leak PI boosting priority to the child: 1663 * Make sure we do not leak PI boosting priority to the child:
1664 */ 1664 */
1665 p->prio = current->normal_prio; 1665 p->prio = current->normal_prio;
1666 if (!rt_prio(p->prio))
1667 p->sched_class = &fair_sched_class;
1666 1668
1667#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) 1669#if defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT)
1668 if (likely(sched_info_on())) 1670 if (likely(sched_info_on()))
@@ -1698,11 +1700,6 @@ void fastcall wake_up_new_task(struct task_struct *p, unsigned long clone_flags)
1698 1700
1699 p->prio = effective_prio(p); 1701 p->prio = effective_prio(p);
1700 1702
1701 if (rt_prio(p->prio))
1702 p->sched_class = &rt_sched_class;
1703 else
1704 p->sched_class = &fair_sched_class;
1705
1706 if (task_cpu(p) != this_cpu || !p->sched_class->task_new || 1703 if (task_cpu(p) != this_cpu || !p->sched_class->task_new ||
1707 !current->se.on_rq) { 1704 !current->se.on_rq) {
1708 activate_task(rq, p, 0); 1705 activate_task(rq, p, 0);