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

Commit 7134b3e9 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

sched/core: Add ENQUEUE_NOCLOCK to ENQUEUE_RESTORE 



In all cases, ENQUEUE_RESTORE should also have ENQUEUE_NOCLOCK because
DEQUEUE_SAVE will have done an update_rq_clock().

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 0a67d1ee

kernel/sched/core.c

+4 −4
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask) 
	p->sched_class->set_cpus_allowed(p, new_mask);



	if (queued)

		enqueue_task(rq, p, ENQUEUE_RESTORE);

		enqueue_task(rq, p, ENQUEUE_RESTORE | ENQUEUE_NOCLOCK);

	if (running)

		set_curr_task(rq, p);

}
@@ -3815,7 +3815,7 @@ void set_user_nice(struct task_struct *p, long nice) 
	delta = p->prio - old_prio;



	if (queued) {

		enqueue_task(rq, p, ENQUEUE_RESTORE);

		enqueue_task(rq, p, ENQUEUE_RESTORE | ENQUEUE_NOCLOCK);

		/*

		 * If the task increased its priority or is running and

		 * lowered its priority, then reschedule its CPU:
@@ -5517,7 +5517,7 @@ void sched_setnuma(struct task_struct *p, int nid) 
	p->numa_preferred_nid = nid;



	if (queued)

		enqueue_task(rq, p, ENQUEUE_RESTORE);

		enqueue_task(rq, p, ENQUEUE_RESTORE | ENQUEUE_NOCLOCK);

	if (running)

		set_curr_task(rq, p);

	task_rq_unlock(rq, p, &rf);
@@ -6431,7 +6431,7 @@ void sched_move_task(struct task_struct *tsk) 
	sched_change_group(tsk, TASK_MOVE_GROUP);



	if (queued)

		enqueue_task(rq, tsk, ENQUEUE_RESTORE | ENQUEUE_MOVE);

		enqueue_task(rq, tsk, ENQUEUE_RESTORE | ENQUEUE_MOVE | ENQUEUE_NOCLOCK);

	if (running)

		set_curr_task(rq, tsk);