public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] sched/rt: Fix a comment in struct sched_dl_entity
@ 2014-05-09  3:21 xiaofeng.yan
  2014-05-19 13:10 ` [tip:sched/core] " tip-bot for xiaofeng.yan
  2014-05-22 12:28 ` [tip:sched/core] sched/rt: Fix 'struct sched_dl_entity' and dl_task_time() comments, to match the current upstream code tip-bot for xiaofeng.yan
  0 siblings, 2 replies; 3+ messages in thread
From: xiaofeng.yan @ 2014-05-09  3:21 UTC (permalink / raw)
  To: linux-kernel, mingo, peterz; +Cc: xiaofeng_yan2004, xiaofeng.yan

Change sched_setscheduler2() to sched_setattr() in the comments.
There isn't function sched_setscheduler2() in the main line.
The previous EDF version defines this function
before being merged into the main line.
User should use sched_setattr() instead of
sched_setscheduler2() now.

Signed-off-by: xiaofeng.yan <xiaofeng.yan@huawei.com>
---
 include/linux/sched.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 25f54c7..ed64468 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1123,8 +1123,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	*/
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [tip:sched/core] sched/rt: Fix a comment in struct sched_dl_entity
  2014-05-09  3:21 [PATCH] sched/rt: Fix a comment in struct sched_dl_entity xiaofeng.yan
@ 2014-05-19 13:10 ` tip-bot for xiaofeng.yan
  2014-05-22 12:28 ` [tip:sched/core] sched/rt: Fix 'struct sched_dl_entity' and dl_task_time() comments, to match the current upstream code tip-bot for xiaofeng.yan
  1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for xiaofeng.yan @ 2014-05-19 13:10 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, peterz, xiaofeng.yan, tglx

Commit-ID:  c07a16f784dfb8083c3b0157fbef18cb1292b9fc
Gitweb:     http://git.kernel.org/tip/c07a16f784dfb8083c3b0157fbef18cb1292b9fc
Author:     xiaofeng.yan <xiaofeng.yan@huawei.com>
AuthorDate: Fri, 9 May 2014 03:21:27 +0000
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Mon, 19 May 2014 22:02:42 +0900

sched/rt: Fix a comment in struct sched_dl_entity

Change sched_setscheduler2() to sched_setattr() in the comments.
There isn't function sched_setscheduler2() in the main line.
The previous EDF version defines this function
before being merged into the main line.
User should use sched_setattr() instead of
sched_setscheduler2() now.

Cc: mingo@redhat.com
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: Thomas Gleixner <tglx@linutronix.de>
---
 include/linux/sched.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 725eef1..0f91d00 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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	*/

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [tip:sched/core] sched/rt: Fix 'struct sched_dl_entity' and dl_task_time() comments, to match the current upstream code
  2014-05-09  3:21 [PATCH] sched/rt: Fix a comment in struct sched_dl_entity xiaofeng.yan
  2014-05-19 13:10 ` [tip:sched/core] " tip-bot for xiaofeng.yan
@ 2014-05-22 12:28 ` tip-bot for xiaofeng.yan
  1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for xiaofeng.yan @ 2014-05-22 12:28 UTC (permalink / raw)
  To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, peterz, xiaofeng.yan, tglx

Commit-ID:  4027d080854d1be96ef134a1c3024d5276114db6
Gitweb:     http://git.kernel.org/tip/4027d080854d1be96ef134a1c3024d5276114db6
Author:     xiaofeng.yan <xiaofeng.yan@huawei.com>
AuthorDate: Fri, 9 May 2014 03:21:27 +0000
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 22 May 2014 11:16:37 +0200

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>
---
 include/linux/sched.h   | 4 ++--
 kernel/sched/deadline.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 725eef1..0f91d00 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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	*/
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
index e0a04ae..f9ca7d1 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)
 	 * 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;

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-05-22 12:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-09  3:21 [PATCH] sched/rt: Fix a comment in struct sched_dl_entity xiaofeng.yan
2014-05-19 13:10 ` [tip:sched/core] " tip-bot for xiaofeng.yan
2014-05-22 12:28 ` [tip:sched/core] sched/rt: Fix 'struct sched_dl_entity' and dl_task_time() comments, to match the current upstream code tip-bot for xiaofeng.yan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox