diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-06-09 15:19:58 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-06-09 15:19:58 +0100 |
| commit | 3db2c6de04e441cd2abaea9acbc02ff1d6b07e57 (patch) | |
| tree | c80a9769ad09d258ca4ce11ee28842e335b0cfb1 | |
| parent | 66ec670fc8bb6bfadfdd3a32abde60d8b14df4c4 (diff) | |
| parent | ac2735d22e0235102d87ea60e6792b7593cbeb0c (diff) | |
Merge branch 'lsk-3.18-armlt-eas' into lsk-3.18-armltlsk-3.18-armlt-20160609
| -rw-r--r-- | kernel/sched/tune.h | 14 | ||||
| -rw-r--r-- | linaro/configs/EAS.conf | 1 |
2 files changed, 3 insertions, 12 deletions
diff --git a/kernel/sched/tune.h b/kernel/sched/tune.h index da1f7b288aa0..3410a1de5413 100644 --- a/kernel/sched/tune.h +++ b/kernel/sched/tune.h @@ -1,6 +1,3 @@ - -#ifdef CONFIG_SCHED_TUNE - #ifdef CONFIG_CGROUP_SCHEDTUNE int schedtune_cpu_boost(int cpu); @@ -13,14 +10,7 @@ int schedtune_normalize_energy(int energy); int schedtune_accept_deltas(int nrg_delta, int cap_delta, struct task_struct *task); -#else /* CONFIG_CGROUP_SCHEDTUNE */ - -#define schedtune_enqueue_task(task, cpu) do { } while (0) -#define schedtune_dequeue_task(task, cpu) do { } while (0) - -#endif /* CONFIG_CGROUP_SCHEDTUNE */ - -#else /* CONFIG_SCHED_TUNE */ +#else #define schedtune_enqueue_task(task, cpu) do { } while (0) #define schedtune_dequeue_task(task, cpu) do { } while (0) @@ -28,4 +18,4 @@ int schedtune_accept_deltas(int nrg_delta, int cap_delta, #define schedtune_normalize_energy(energy) energy #define schedtune_accept_deltas(nrg_delta, cap_delta, task) nrg_delta -#endif /* CONFIG_SCHED_TUNE */ +#endif diff --git a/linaro/configs/EAS.conf b/linaro/configs/EAS.conf index 5987e188096d..5e2f003cf868 100644 --- a/linaro/configs/EAS.conf +++ b/linaro/configs/EAS.conf @@ -1,4 +1,5 @@ CONFIG_CPU_FREQ_GOV_SCHED=y CONFIG_CPU_FREQ_DEFAULT_GOV_SCHED=y CONFIG_SCHED_TUNE=y +CONFIG_CGROUPS=y CONFIG_CGROUP_SCHEDTUNE=y |