Skip to contentSkip to conversation

kernel:sched: renamed max_vruntime parameter

PATCH New Andrei Epure 2 participants 2 messages Mar 12, 2013 – Mar 18, 2013 Scheduler

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel:sched: renamed max_vruntime parameter

The min_vruntime variable actually stores the maximum value. The added comment was taken from place_entity function.

---
 kernel/sched/fair.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
kernel/sched/fair.c +5 -4
index 7a33e59..ff4cffb 100644
@@ -431,13 +431,13 @@ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, unsigned long delta_exec);
  * Scheduling class tree data structure manipulation methods:
  */
 
-static inline u64 max_vruntime(u64 min_vruntime, u64 vruntime)
+static inline u64 max_vruntime(u64 max_vruntime, u64 vruntime)
 {
-	s64 delta = (s64)(vruntime - min_vruntime);
+	s64 delta = (s64)(vruntime - max_vruntime);
 	if (delta > 0)
-		min_vruntime = vruntime;
+		max_vruntime = vruntime;
 
-	return min_vruntime;
+	return max_vruntime;
 }
 
 static inline u64 min_vruntime(u64 min_vruntime, u64 vruntime)
@@ -473,6 +473,7 @@ static void update_min_vruntime(struct cfs_rq *cfs_rq)
 			vruntime = min_vruntime(vruntime, se->vruntime);
 	}
 
+	/* ensure we never gain time by being placed backwards. */
 	cfs_rq->min_vruntime = max_vruntime(cfs_rq->min_vruntime, vruntime);
 #ifndef CONFIG_64BIT
 	smp_wmb();
Signature · 1 line
1.7.9.5
#1 lore raw

[tip:sched/core] sched: Fix variable name misnomer, add comments

sched: Fix variable name misnomer, add comments
Commit-ID:  1bf08230f745e48fea9c18ee34a73581631fe7c9
Gitweb:     http://git.kernel.org/tip/1bf08230f745e48fea9c18ee34a73581631fe7c9
Author:     Andrei Epure <[email protected]>
AuthorDate: Tue, 12 Mar 2013 21:12:24 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 14 Mar 2013 08:22:29 +0100

sched: Fix variable name misnomer, add comments

The min_vruntime variable actually stores the maximum value. The added comment was taken from place_entity function.

---
 kernel/sched/fair.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
kernel/sched/fair.c +5 -4
index 22bd9e6..539760e 100644
@@ -431,13 +431,13 @@ void account_cfs_rq_runtime(struct cfs_rq *cfs_rq, unsigned long delta_exec);
  * Scheduling class tree data structure manipulation methods:
  */
 
-static inline u64 max_vruntime(u64 min_vruntime, u64 vruntime)
+static inline u64 max_vruntime(u64 max_vruntime, u64 vruntime)
 {
-	s64 delta = (s64)(vruntime - min_vruntime);
+	s64 delta = (s64)(vruntime - max_vruntime);
 	if (delta > 0)
-		min_vruntime = vruntime;
+		max_vruntime = vruntime;
 
-	return min_vruntime;
+	return max_vruntime;
 }
 
 static inline u64 min_vruntime(u64 min_vruntime, u64 vruntime)
@@ -473,6 +473,7 @@ static void update_min_vruntime(struct cfs_rq *cfs_rq)
 			vruntime = min_vruntime(vruntime, se->vruntime);
 	}
 
+	/* ensure we never gain time by being placed backwards. */
 	cfs_rq->min_vruntime = max_vruntime(cfs_rq->min_vruntime, vruntime);
 #ifndef CONFIG_64BIT
 	smp_wmb();