Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e80fb7e5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'sched-fixes-for-linus' of... 

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Set correct normal_prio and prio values in sched_fork()
parents 624235c5 f83f9ac2

kernel/sched.c

+9 −11
Original line number Original line Diff line number Diff line
@@ -2514,23 +2514,18 @@ void sched_fork(struct task_struct *p, int clone_flags) 




	__sched_fork(p);

	__sched_fork(p);





	/*

	 * Make sure we do not leak PI boosting priority to the child.

	 */

	p->prio = current->normal_prio;



	/*

	/*

	 * Revert to default priority/policy on fork if requested.

	 * Revert to default priority/policy on fork if requested.

	 */

	 */

	if (unlikely(p->sched_reset_on_fork)) {

	if (unlikely(p->sched_reset_on_fork)) {

		if (p->policy == SCHED_FIFO || p->policy == SCHED_RR)

		if (p->policy == SCHED_FIFO || p->policy == SCHED_RR) {

			p->policy = SCHED_NORMAL;

			p->policy = SCHED_NORMAL;



			p->normal_prio = p->static_prio;

		if (p->normal_prio < DEFAULT_PRIO)

		}

			p->prio = DEFAULT_PRIO;





		if (PRIO_TO_NICE(p->static_prio) < 0) {

		if (PRIO_TO_NICE(p->static_prio) < 0) {

			p->static_prio = NICE_TO_PRIO(0);

			p->static_prio = NICE_TO_PRIO(0);

			p->normal_prio = p->static_prio;

			set_load_weight(p);

			set_load_weight(p);

		}

		}
@@ -2541,6 +2536,11 @@ void sched_fork(struct task_struct *p, int clone_flags) 
		p->sched_reset_on_fork = 0;

		p->sched_reset_on_fork = 0;

	}

	}





	/*

	 * Make sure we do not leak PI boosting priority to the child.

	 */

	p->prio = current->normal_prio;



	if (!rt_prio(p->prio))

	if (!rt_prio(p->prio))

		p->sched_class = &fair_sched_class;

		p->sched_class = &fair_sched_class;
@@ -2581,8 +2581,6 @@ void wake_up_new_task(struct task_struct *p, unsigned long clone_flags) 
	BUG_ON(p->state != TASK_RUNNING);

	BUG_ON(p->state != TASK_RUNNING);

	update_rq_clock(rq);

	update_rq_clock(rq);





	p->prio = effective_prio(p);



	if (!p->sched_class->task_new || !current->se.on_rq) {

	if (!p->sched_class->task_new || !current->se.on_rq) {

		activate_task(rq, p, 0);

		activate_task(rq, p, 0);

	} else {

	} else {