evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sched: fix compile failure where !CONFIG_SCHED_HMP

Browse source 
Fix compile failure when HMP scheduler isn't selected.

Change-Id: I411fa3501a4c4ac280c037a1698aa3b7278d440f
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
This commit is contained in:
Joonwoo Park 2015-12-17 13:13:34 -08:00 • committed by David Keitel
parent 07eb3f803b
commit 9df619ba91
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kernel/sched/fair.c
View file

@ -5246,7 +5246,9 @@ static void throttle_cfs_rq(struct cfs_rq *cfs_rq)
if (dequeue)
dequeue_entity(qcfs_rq, se, DEQUEUE_SLEEP);
qcfs_rq->h_nr_running -= task_delta;
#ifdef CONFIG_SCHED_HMP
dec_throttled_cfs_rq_hmp_stats(&qcfs_rq->hmp_stats, cfs_rq);
#endif
if (qcfs_rq->load.weight)
dequeue = 0;
@ -5254,7 +5256,9 @@ static void throttle_cfs_rq(struct cfs_rq *cfs_rq)
if (!se) {
sub_nr_running(rq, task_delta);
#ifdef CONFIG_SCHED_HMP
dec_throttled_cfs_rq_hmp_stats(&rq->hmp_stats, cfs_rq);
#endif
}
cfs_rq->throttled = 1;
@ -5319,7 +5323,9 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq)
if (enqueue)
enqueue_entity(cfs_rq, se, ENQUEUE_WAKEUP);
cfs_rq->h_nr_running += task_delta;
#ifdef CONFIG_SCHED_HMP
inc_throttled_cfs_rq_hmp_stats(&cfs_rq->hmp_stats, tcfs_rq);
#endif
if (cfs_rq_throttled(cfs_rq))
break;
@ -5327,7 +5333,9 @@ void unthrottle_cfs_rq(struct cfs_rq *cfs_rq)
if (!se) {
add_nr_running(rq, task_delta);
#ifdef CONFIG_SCHED_HMP
inc_throttled_cfs_rq_hmp_stats(&rq->hmp_stats, tcfs_rq);
#endif
}
/* determine whether we need to wake up potentially idle cpu */

4
kernel/sched/sched.h
View file

@ -1137,6 +1137,8 @@ static inline int sched_cpu_high_irqload(int cpu)
#else /* CONFIG_SCHED_HMP */
#define sched_use_pelt 0
struct hmp_sched_stats;
static inline u64 scale_load_to_cpu(u64 load, int cpu)
@ -1289,8 +1291,6 @@ static inline void set_hmp_defaults(void) { }
static inline void clear_reserved(int cpu) { }
#define power_cost(...) 0
#define trace_sched_cpu_load(...)
#define trace_sched_cpu_load_lb(...)
#define trace_sched_cpu_load_cgroup(...)