Now the walt doesn't use walt_fixup_busy_time(), remove it.
Signed-off-by: Leo Yan leo.yan@linaro.org --- kernel/sched/walt.c | 51 --------------------------------------------------- kernel/sched/walt.h | 2 -- 2 files changed, 53 deletions(-)
diff --git a/kernel/sched/walt.c b/kernel/sched/walt.c index b2a22b3..df72fb4 100644 --- a/kernel/sched/walt.c +++ b/kernel/sched/walt.c @@ -910,57 +910,6 @@ void walt_prepare_migrate(struct task_struct *p, struct rq *src_rq, bool locked) trace_walt_migration_update_sum(src_rq, p); }
-void walt_fixup_busy_time(struct task_struct *p, int new_cpu) -{ - struct rq *src_rq = task_rq(p); - struct rq *dest_rq = cpu_rq(new_cpu); - u64 wallclock; - - if (!p->on_rq && p->state != TASK_WAKING) - return; - - if (exiting_task(p)) { - return; - } - - if (p->state == TASK_WAKING) - double_rq_lock(src_rq, dest_rq); - - wallclock = walt_ktime_clock(); - - walt_update_task_ravg(task_rq(p)->curr, task_rq(p), - TASK_UPDATE, wallclock, 0); - walt_update_task_ravg(dest_rq->curr, dest_rq, - TASK_UPDATE, wallclock, 0); - - walt_update_task_ravg(p, task_rq(p), TASK_MIGRATE, wallclock, 0); - - if (p->ravg.curr_window) { - src_rq->curr_runnable_sum -= p->ravg.curr_window; - dest_rq->curr_runnable_sum += p->ravg.curr_window; - } - - if (p->ravg.prev_window) { - src_rq->prev_runnable_sum -= p->ravg.prev_window; - dest_rq->prev_runnable_sum += p->ravg.prev_window; - } - - if ((s64)src_rq->prev_runnable_sum < 0) { - src_rq->prev_runnable_sum = 0; - WARN_ON(1); - } - if ((s64)src_rq->curr_runnable_sum < 0) { - src_rq->curr_runnable_sum = 0; - WARN_ON(1); - } - - trace_walt_migration_update_sum(src_rq, p); - trace_walt_migration_update_sum(dest_rq, p); - - if (p->state == TASK_WAKING) - double_rq_unlock(src_rq, dest_rq); -} - /* Keep track of max/min capacity possible across CPUs "currently" */ static void __update_min_max_capacity(void) { diff --git a/kernel/sched/walt.h b/kernel/sched/walt.h index 91bc3cc..2e5b99d 100644 --- a/kernel/sched/walt.h +++ b/kernel/sched/walt.h @@ -26,7 +26,6 @@ void walt_dec_cfs_cumulative_runnable_avg(struct cfs_rq *rq, struct task_struct *p); void walt_prepare_migrate(struct task_struct *p, struct rq *rq, bool locked); void walt_finish_migrate(struct task_struct *p, struct rq *rq, bool locked); -void walt_fixup_busy_time(struct task_struct *p, int new_cpu); void walt_init_new_task_load(struct task_struct *p); void walt_mark_task_starting(struct task_struct *p); void walt_set_window_start(struct rq *rq); @@ -51,7 +50,6 @@ static inline void walt_dec_cfs_cumulative_runnable_avg(struct cfs_rq *rq, struct task_struct *p) { } static inline void walt_prepare_migrate(struct task_struct *p, struct rq *rq, bool locked) { } static inline void walt_finish_migrate(struct task_struct *p, struct rq *rq, bool locked) { } -static inline void walt_fixup_busy_time(struct task_struct *p, int new_cpu) { } static inline void walt_init_new_task_load(struct task_struct *p) { } static inline void walt_mark_task_starting(struct task_struct *p) { } static inline void walt_set_window_start(struct rq *rq) { } -- 1.9.1