From db3dba6818796b90053d5b1bc9f15837acdc9b9c Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Tue, 8 Apr 2014 16:43:25 +0100 Subject: Revert "hmp: sched: Clean up hmp_up_threshold checks into a utility fn" This reverts commit 765aae26e6e296333c3a5f7a02360f5389dc439a. Signed-off-by: Jon Medhurst --- kernel/sched/fair.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index febf67ef8e4..43857fec77b 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -6707,14 +6707,6 @@ static void nohz_idle_balance(int this_cpu, enum cpu_idle_type idle) { } #endif #ifdef CONFIG_SCHED_HMP -static unsigned int hmp_task_eligible_for_up_migration(struct sched_entity *se) -{ - /* below hmp_up_threshold, never eligible */ - if (se->avg.load_avg_ratio < hmp_up_threshold) - return 0; - return 1; -} - /* Check if task should migrate to a faster cpu */ static unsigned int hmp_up_migration(int cpu, int *target_cpu, struct sched_entity *se) { @@ -6730,7 +6722,7 @@ static unsigned int hmp_up_migration(int cpu, int *target_cpu, struct sched_enti if (p->prio >= hmp_up_prio) return 0; #endif - if (!hmp_task_eligible_for_up_migration(se)) + if (se->avg.load_avg_ratio < hmp_up_threshold) return 0; /* Let the task load settle before doing another up migration */ @@ -7218,10 +7210,7 @@ static unsigned int hmp_idle_pull(int this_cpu) } orig = curr; curr = hmp_get_heaviest_task(curr, 1); - /* check if heaviest eligible task on this - * CPU is heavier than previous task - */ - if (hmp_task_eligible_for_up_migration(curr) && + if (curr->avg.load_avg_ratio > hmp_up_threshold && curr->avg.load_avg_ratio > ratio) { p = task_of(curr); target = rq; -- cgit v1.2.3