2011-04-08 04:53:12

by Shaohua Li

Subject: [PATCH trival]sched: delete duplicate code

calc_delta_fair checks NICE_0_LOAD already, delete duplicate check.

Signed-off-by: Shaohua Li<[email protected]>

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 3f7ec9e..55375d8 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1788,10 +1788,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);
}

/*

2011-04-11 10:49:16

by Shaohua Li

Subject: [tip:sched/core] sched: Eliminate dead code from wakeup_gran()

Commit-ID: f4ad9bd208c98f32a6f9136618e0b8bebe3fb370
Gitweb: http://git.kernel.org/tip/f4ad9bd208c98f32a6f9136618e0b8bebe3fb370
Author: Shaohua Li <[email protected]>
AuthorDate: Fri, 8 Apr 2011 12:53:09 +0800
Committer: Ingo Molnar <[email protected]>
CommitDate: Mon, 11 Apr 2011 11:08:55 +0200

sched: Eliminate dead code from wakeup_gran()

calc_delta_fair() checks NICE_0_LOAD already, delete duplicate check.

Signed-off-by: Shaohua Li<[email protected]>
Signed-off-by: Peter Zijlstra <[email protected]>
Cc: Mike Galbraith <[email protected]>
Link: http://lkml.kernel.org/r/1302238389.3981.92.camel@sli10-conroe
Signed-off-by: Ingo Molnar <[email protected]>
---
kernel/sched_fair.c | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index 6fa833a..4ee50f0 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);
}

/*