diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-22 13:57:31 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-22 13:57:31 +0000 |
| commit | f41a52ee6767653f23794ccc7f342d5628c2f6f7 (patch) | |
| tree | 5a1275a0a826d67cdf48c7b4e7350f8bfcc43315 | |
| parent | 6144a4a2cb079681894c1b7547ca1f9b5984cea4 (diff) | |
| parent | 8a2e77d79f79c22ba7d6887e4003ffae529f1a57 (diff) | |
| download | linaro-lsk-lsk-android-13.11.tar.gz | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-android-13.11
| -rw-r--r-- | kernel/sched/fair.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 22913a60001..3e242209bc3 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -1210,6 +1210,7 @@ static u32 __compute_runnable_contrib(u64 n) return contrib + runnable_avg_yN_sum[n]; } +#ifdef CONFIG_SCHED_HMP #define HMP_VARIABLE_SCALE_SHIFT 16ULL struct hmp_global_attr { struct attribute attr; @@ -1291,6 +1292,7 @@ struct cpufreq_extents { static struct cpufreq_extents freq_scale[CONFIG_NR_CPUS]; #endif /* CONFIG_HMP_FREQUENCY_INVARIANT_SCALE */ +#endif /* CONFIG_SCHED_HMP */ /* We can represent the historical contribution to runnable average as the * coefficients of a geometric series. To do this we sub-divide our runnable @@ -1336,8 +1338,9 @@ static __always_inline int __update_entity_runnable_avg(u64 now, #endif /* CONFIG_HMP_FREQUENCY_INVARIANT_SCALE */ delta = now - sa->last_runnable_update; - +#ifdef CONFIG_SCHED_HMP delta = hmp_variable_scale_convert(delta); +#endif /* * This should only happen when time goes backwards, which it * unfortunately does during sched clock init when we swap over to TSC. |