diff options
| author | Joonwoo Park <joonwoop@codeaurora.org> | 2015-12-17 13:13:34 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 20:02:44 -0700 |
| commit | 9df619ba91e8c6a24bd817d7b939fb2381f26c19 (patch) | |
| tree | f3fe963de47e8a35fc5291bf81c0559f301bbb6e /kernel | |
| parent | 07eb3f803b419bdebad45d846113dc069307be90 (diff) | |
sched: fix compile failure where !CONFIG_SCHED_HMP
Fix compile failure when HMP scheduler isn't selected.
Change-Id: I411fa3501a4c4ac280c037a1698aa3b7278d440f
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched/fair.c | 8 | ||||
| -rw-r--r-- | kernel/sched/sched.h | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 9ffcaa5cf41c..fbc5e647c59e 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -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 */ diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index 85531d648cfb..1e4b2e986b15 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -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(...) |