diff options
-rw-r--r-- | kernel/sched_fair.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index 0588c0b933a8..a2ecbaa28b4c 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -321,11 +321,6 @@ static inline int entity_before(struct sched_entity *a, | |||
321 | return (s64)(a->vruntime - b->vruntime) < 0; | 321 | return (s64)(a->vruntime - b->vruntime) < 0; |
322 | } | 322 | } |
323 | 323 | ||
324 | static inline s64 entity_key(struct cfs_rq *cfs_rq, struct sched_entity *se) | ||
325 | { | ||
326 | return se->vruntime - cfs_rq->min_vruntime; | ||
327 | } | ||
328 | |||
329 | static void update_min_vruntime(struct cfs_rq *cfs_rq) | 324 | static void update_min_vruntime(struct cfs_rq *cfs_rq) |
330 | { | 325 | { |
331 | u64 vruntime = cfs_rq->min_vruntime; | 326 | u64 vruntime = cfs_rq->min_vruntime; |
@@ -359,7 +354,6 @@ static void __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se) | |||
359 | struct rb_node **link = &cfs_rq->tasks_timeline.rb_node; | 354 | struct rb_node **link = &cfs_rq->tasks_timeline.rb_node; |
360 | struct rb_node *parent = NULL; | 355 | struct rb_node *parent = NULL; |
361 | struct sched_entity *entry; | 356 | struct sched_entity *entry; |
362 | s64 key = entity_key(cfs_rq, se); | ||
363 | int leftmost = 1; | 357 | int leftmost = 1; |
364 | 358 | ||
365 | /* | 359 | /* |
@@ -372,7 +366,7 @@ static void __enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se) | |||
372 | * We dont care about collisions. Nodes with | 366 | * We dont care about collisions. Nodes with |
373 | * the same key stay together. | 367 | * the same key stay together. |
374 | */ | 368 | */ |
375 | if (key < entity_key(cfs_rq, entry)) { | 369 | if (entity_before(se, entry)) { |
376 | link = &parent->rb_left; | 370 | link = &parent->rb_left; |
377 | } else { | 371 | } else { |
378 | link = &parent->rb_right; | 372 | link = &parent->rb_right; |