From 6d5adb184946b1751b8e3ea522c8e382bcd6ec0c Mon Sep 17 00:00:00 2001 From: Pavankumar Kondeti Date: Fri, 5 Jan 2018 10:21:34 +0530 Subject: sched: Restore previous implementation of check_for_migration() commit 3bda2b55b41d ("Merge android-4.4.96 (aed4c54) into msm-4.4") replaced HMP scheduler check_for_migration() implementation with EAS scheduler implementation. This breaks HMP scheduler upmgiration functionality. Fix this by restoring the previous implementation. Change-Id: I3221f3efe42e1e43f8009cfa52c11afbb9d9c5b3 Signed-off-by: Pavankumar Kondeti --- kernel/sched/sched.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel/sched/sched.h') diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 7426ae4dced3..7ff14b7f598e 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -32,10 +32,8 @@ extern long calc_load_fold_active(struct rq *this_rq); #ifdef CONFIG_SMP extern void update_cpu_load_active(struct rq *this_rq); -extern void check_for_migration(struct rq *rq, struct task_struct *p); #else static inline void update_cpu_load_active(struct rq *this_rq) { } -static inline void check_for_migration(struct rq *rq, struct task_struct *p) { } #endif /* @@ -1449,6 +1447,7 @@ static inline bool is_short_burst_task(struct task_struct *p) p->ravg.avg_sleep_time > sysctl_sched_short_sleep; } +extern void check_for_migration(struct rq *rq, struct task_struct *p); extern void pre_big_task_count_change(const struct cpumask *cpus); extern void post_big_task_count_change(const struct cpumask *cpus); extern void set_hmp_defaults(void); @@ -1708,6 +1707,7 @@ static inline int same_freq_domain(int src_cpu, int dst_cpu) return 1; } +static inline void check_for_migration(struct rq *rq, struct task_struct *p) { } static inline void pre_big_task_count_change(void) { } static inline void post_big_task_count_change(void) { } static inline void set_hmp_defaults(void) { } -- cgit v1.2.3