aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShaohua Li <shaohua.li@intel.com>2011-04-08 12:53:09 +0800
committerIngo Molnar <mingo@elte.hu>2011-04-11 11:08:55 +0200
commitf4ad9bd208c98f32a6f9136618e0b8bebe3fb370 (patch)
tree1cefacea2cc5d95f148a0036b1b13996ba8ed04f
parentb30aef17f71cf9e24b10c11cbb5e5f0ebe8a85ab (diff)
sched: Eliminate dead code from wakeup_gran()
calc_delta_fair() checks NICE_0_LOAD already, delete duplicate check. Signed-off-by: Shaohua Li<shaohua.li@intel.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Mike Galbraith <efault@gmx.de> Link: http://lkml.kernel.org/r/1302238389.3981.92.camel@sli10-conroe Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--kernel/sched_fair.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 6fa833ab2cb8..4ee50f0af8d1 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1789,10 +1789,7 @@ wakeup_gran(struct sched_entity *curr, struct sched_entity *se)
* This is especially important for buddies when the leftmost
* task is higher priority than the buddy.
*/
- if (unlikely(se->load.weight != NICE_0_LOAD))
- gran = calc_delta_fair(gran, se);
-
- return gran;
+ return calc_delta_fair(gran, se);
}
/*