1 files changed, 6 insertions, 9 deletions

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 6c091d6e159d..7abad50d935f 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -202,16 +202,13 @@ static struct sched_entity *__pick_next_entity(struct cfs_rq *cfs_rq)
 
 static inline struct sched_entity *__pick_last_entity(struct cfs_rq *cfs_rq)
 {
-        struct rb_node **link = &cfs_rq->tasks_timeline.rb_node;
-        struct sched_entity *se = NULL;
-        struct rb_node *parent;
-
-        while (*link) {
-                parent = *link;
-                se = rb_entry(parent, struct sched_entity, run_node);
-                link = &parent->rb_right;
-        }
+        struct rb_node *last;
+        struct sched_entity *se;
 
+        last = rb_last(&cfs_rq->tasks_timeline);
+        if (!last)
+                return NULL;
+        se = rb_entry(last, struct sched_entity, run_node);
         return se;
 }