From 37540014e431a16455d0030f4eedc187022aa722 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 22 Feb 2008 10:32:21 +0100 Subject: [PATCH] --- yaml --- r: 86323 b: refs/heads/master c: 7eee3e677d6e2e9007afcd7d79b0715525aa552e h: refs/heads/master i: 86321: be11249b01c0de8df6ecf95b284dc7646d469636 86319: c3039fb20d6e5360271d342d41ce23bb71225cc1 v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 962a964a1a32..e43c079221af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70eee74b70c1a8485ec5f2bafa13dbc66fab6e02 +refs/heads/master: 7eee3e677d6e2e9007afcd7d79b0715525aa552e diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 7abad50d935f..c8e6492c5925 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -202,14 +202,12 @@ 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 *last; - struct sched_entity *se; + struct rb_node *last = rb_last(&cfs_rq->tasks_timeline); - last = rb_last(&cfs_rq->tasks_timeline); if (!last) return NULL; - se = rb_entry(last, struct sched_entity, run_node); - return se; + + return rb_entry(last, struct sched_entity, run_node); } /**************************************************************