aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kernel/sched_fair.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 14a9b9b997ce..a9dfb7746c5c 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -112,8 +112,7 @@ static inline struct task_struct *task_of(struct sched_entity *se)
112 * Scheduling class tree data structure manipulation methods: 112 * Scheduling class tree data structure manipulation methods:
113 */ 113 */
114 114
115static inline u64 115static inline u64 max_vruntime(u64 min_vruntime, u64 vruntime)
116max_vruntime(u64 min_vruntime, u64 vruntime)
117{ 116{
118 s64 delta = (s64)(vruntime - min_vruntime); 117 s64 delta = (s64)(vruntime - min_vruntime);
119 if (delta > 0) 118 if (delta > 0)
@@ -122,8 +121,7 @@ max_vruntime(u64 min_vruntime, u64 vruntime)
122 return min_vruntime; 121 return min_vruntime;
123} 122}
124 123
125static inline u64 124static inline u64 min_vruntime(u64 min_vruntime, u64 vruntime)
126min_vruntime(u64 min_vruntime, u64 vruntime)
127{ 125{
128 s64 delta = (s64)(vruntime - min_vruntime); 126 s64 delta = (s64)(vruntime - min_vruntime);
129 if (delta < 0) 127 if (delta < 0)
@@ -132,8 +130,7 @@ min_vruntime(u64 min_vruntime, u64 vruntime)
132 return min_vruntime; 130 return min_vruntime;
133} 131}
134 132
135static inline s64 133static inline s64 entity_key(struct cfs_rq *cfs_rq, struct sched_entity *se)
136entity_key(struct cfs_rq *cfs_rq, struct sched_entity *se)
137{ 134{
138 return se->vruntime - cfs_rq->min_vruntime; 135 return se->vruntime - cfs_rq->min_vruntime;
139} 136}
@@ -141,8 +138,7 @@ entity_key(struct cfs_rq *cfs_rq, struct sched_entity *se)
141/* 138/*
142 * Enqueue an entity into the rb-tree: 139 * Enqueue an entity into the rb-tree:
143 */ 140 */
144static void 141static void __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
145__enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
146{ 142{
147 struct rb_node **link = &cfs_rq->tasks_timeline.rb_node; 143 struct rb_node **link = &cfs_rq->tasks_timeline.rb_node;
148 struct rb_node *parent = NULL; 144 struct rb_node *parent = NULL;
@@ -179,8 +175,7 @@ __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
179 rb_insert_color(&se->run_node, &cfs_rq->tasks_timeline); 175 rb_insert_color(&se->run_node, &cfs_rq->tasks_timeline);
180} 176}
181 177
182static void 178static void __dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
183__dequeue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se)
184{ 179{
185 if (cfs_rq->rb_leftmost == &se->run_node) 180 if (cfs_rq->rb_leftmost == &se->run_node)
186 cfs_rq->rb_leftmost = rb_next(&se->run_node); 181 cfs_rq->rb_leftmost = rb_next(&se->run_node);