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

Commit 4027d080 authored by xiaofeng.yan's avatar xiaofeng.yan Committed by Ingo Molnar
Browse files

sched/rt: Fix 'struct sched_dl_entity' and dl_task_time() comments, to match... 


sched/rt: Fix 'struct sched_dl_entity' and dl_task_time() comments, to match the current upstream code

Signed-off-by: default avatarxiaofeng.yan <xiaofeng.yan@huawei.com>
Signed-off-by: default avatarPeter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1399605687-18094-1-git-send-email-xiaofeng.yan@huawei.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 7aa2c016

include/linux/sched.h

+2 −2
Original line number Diff line number Diff line
@@ -1175,8 +1175,8 @@ struct sched_dl_entity { 


	/*

	 * Original scheduling parameters. Copied here from sched_attr

	 * during sched_setscheduler2(), they will remain the same until

	 * the next sched_setscheduler2().

	 * during sched_setattr(), they will remain the same until

	 * the next sched_setattr().

	 */

	u64 dl_runtime;		/* maximum runtime for each instance	*/

	u64 dl_deadline;	/* relative deadline of each instance	*/

kernel/sched/deadline.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static enum hrtimer_restart dl_task_timer(struct hrtimer *timer) 
	 * We need to take care of a possible races here. In fact, the

	 * task might have changed its scheduling policy to something

	 * different from SCHED_DEADLINE or changed its reservation

	 * parameters (through sched_setscheduler()).

	 * parameters (through sched_setattr()).

	 */

	if (!dl_task(p) || dl_se->dl_new)

		goto unlock;