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

Commit efc2b629 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sched: Update task->on_rq when tasks are moving between runqueues"

parents 930303d6 4543aba0

kernel/sched/core.c

+2 −0
Original line number Diff line number Diff line
@@ -2727,7 +2727,9 @@ static void __migrate_swap_task(struct task_struct *p, int cpu) 
		dst_rq = cpu_rq(cpu);



		deactivate_task(src_rq, p, 0);

		p->on_rq = TASK_ON_RQ_MIGRATING;

		set_task_cpu(p, cpu);

		p->on_rq = TASK_ON_RQ_QUEUED;

		activate_task(dst_rq, p, 0);

		check_preempt_curr(dst_rq, p, 0);

	} else {

kernel/sched/deadline.c

+4 −0
Original line number Diff line number Diff line
@@ -1408,7 +1408,9 @@ retry: 
	}



	deactivate_task(rq, next_task, 0);

	next_task->on_rq = TASK_ON_RQ_MIGRATING;

	set_task_cpu(next_task, later_rq->cpu);

	next_task->on_rq = TASK_ON_RQ_QUEUED;

	activate_task(later_rq, next_task, 0);



	resched_curr(later_rq);
@@ -1494,7 +1496,9 @@ static int pull_dl_task(struct rq *this_rq) 
			ret = 1;



			deactivate_task(src_rq, p, 0);

			p->on_rq = TASK_ON_RQ_MIGRATING;

			set_task_cpu(p, this_cpu);

			p->on_rq = TASK_ON_RQ_QUEUED;

			activate_task(this_rq, p, 0);

			dmin = p->dl.deadline;

kernel/sched/rt.c

+4 −0
Original line number Diff line number Diff line
@@ -1918,7 +1918,9 @@ retry: 
	}



	deactivate_task(rq, next_task, 0);

	next_task->on_rq = TASK_ON_RQ_MIGRATING;

	set_task_cpu(next_task, lowest_rq->cpu);

	next_task->on_rq = TASK_ON_RQ_QUEUED;

	activate_task(lowest_rq, next_task, 0);

	ret = 1;
@@ -2006,7 +2008,9 @@ static int pull_rt_task(struct rq *this_rq) 
			ret = 1;



			deactivate_task(src_rq, p, 0);

			p->on_rq = TASK_ON_RQ_MIGRATING;

			set_task_cpu(p, this_cpu);

			p->on_rq = TASK_ON_RQ_QUEUED;

			activate_task(this_rq, p, 0);

			/*

			 * We continue with the search, just in