[PATCH] sched: Remove WAKEUP_PREEMPT feature check in entity_tick

From: Lin Ming
Date: Thu Jul 28 2011 - 05:43:31 EST


Currently, entity_tick calls check_preempt_tick if WAKEUP_PREEMPT feature is
disabled. That's wrong. It should do that if the feature is enabled.

And actually the check is duplicate because check_preempt_tick will do
that. So just remove it from entity_tick.

Signed-off-by: Lin Ming <ming.m.lin@xxxxxxxxx>
---
kernel/sched_fair.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index bc8ee99..af2fe9d 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1233,7 +1233,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
return;
#endif

- if (cfs_rq->nr_running > 1 || !sched_feat(WAKEUP_PREEMPT))
+ if (cfs_rq->nr_running > 1)
check_preempt_tick(cfs_rq, curr);
}

--
1.7.2.3



--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/