aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxiaofeng.yan <xiaofeng.yan@huawei.com>2014-05-08 23:21:27 -0400
committerIngo Molnar <mingo@kernel.org>2014-05-22 05:16:37 -0400
commit4027d080854d1be96ef134a1c3024d5276114db6 (patch)
treec4e14308e38bc813cb68fcd7ce4421a8599f6893
parent7aa2c016db2162defff77f6f5731bff3f25e5175 (diff)
sched/rt: Fix 'struct sched_dl_entity' and dl_task_time() comments, to match the current upstream code
Signed-off-by: xiaofeng.yan <xiaofeng.yan@huawei.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1399605687-18094-1-git-send-email-xiaofeng.yan@huawei.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--include/linux/sched.h4
-rw-r--r--kernel/sched/deadline.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 725eef121c9f..0f91d00efd87 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1175,8 +1175,8 @@ struct sched_dl_entity {
1175 1175
1176 /* 1176 /*
1177 * Original scheduling parameters. Copied here from sched_attr 1177 * Original scheduling parameters. Copied here from sched_attr
1178 * during sched_setscheduler2(), they will remain the same until 1178 * during sched_setattr(), they will remain the same until
1179 * the next sched_setscheduler2(). 1179 * the next sched_setattr().
1180 */ 1180 */
1181 u64 dl_runtime; /* maximum runtime for each instance */ 1181 u64 dl_runtime; /* maximum runtime for each instance */
1182 u64 dl_deadline; /* relative deadline of each instance */ 1182 u64 dl_deadline; /* relative deadline of each instance */
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index e0a04ae1e0dd..f9ca7d19781a 100644
--- a/kernel/sched/deadline.c
+++ b/kernel/sched/deadline.c
@@ -520,7 +520,7 @@ static enum hrtimer_restart dl_task_timer(struct hrtimer *timer)
520 * We need to take care of a possible races here. In fact, the 520 * We need to take care of a possible races here. In fact, the
521 * task might have changed its scheduling policy to something 521 * task might have changed its scheduling policy to something
522 * different from SCHED_DEADLINE or changed its reservation 522 * different from SCHED_DEADLINE or changed its reservation
523 * parameters (through sched_setscheduler()). 523 * parameters (through sched_setattr()).
524 */ 524 */
525 if (!dl_task(p) || dl_se->dl_new) 525 if (!dl_task(p) || dl_se->dl_new)
526 goto unlock; 526 goto unlock;