diff options
| author | Patrick Bellasi <patrick.bellasi@arm.com> | 2016-07-28 17:42:36 +0100 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2016-08-10 15:20:38 -0700 |
| commit | 274bbcfbe44127c5575ed847d48d201a66cc29ce (patch) | |
| tree | 2e2ae709701050b2bb0c63f25cfe8099693bd785 /kernel/sched/fair.c | |
| parent | 254f5095a8143f0b852c5db7672957cf3b4d65d3 (diff) | |
sched/{fair,tune}: simplify fair.c code
The usage of conditional compiled code is discouraged in fair.c.
This patch clean up a bit fair.c by moving schedtune_{cpu.task}_boost
definitions into tune.h.
Signed-off-by: Patrick Bellasi <patrick.bellasi@arm.com>
Diffstat (limited to 'kernel/sched/fair.c')
| -rw-r--r-- | kernel/sched/fair.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index aef41d9acd83..6390b4cb916c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -5077,18 +5077,13 @@ normalize_energy(int energy_diff) static inline int energy_diff(struct energy_env *eenv) { - unsigned int boost; + int boost = schedtune_task_boost(eenv->task); int nrg_delta; /* Conpute "absolute" energy diff */ __energy_diff(eenv); /* Return energy diff when boost margin is 0 */ -#ifdef CONFIG_CGROUP_SCHEDTUNE - boost = schedtune_task_boost(eenv->task); -#else - boost = get_sysctl_sched_cfs_boost(); -#endif if (boost == 0) return eenv->nrg.diff; @@ -5292,13 +5287,8 @@ schedtune_margin(unsigned long signal, long boost) static inline int schedtune_cpu_margin(unsigned long util, int cpu) { - int boost; + int boost = schedtune_cpu_boost(cpu); -#ifdef CONFIG_CGROUP_SCHEDTUNE - boost = schedtune_cpu_boost(cpu); -#else - boost = get_sysctl_sched_cfs_boost(); -#endif if (boost == 0) return 0; @@ -5308,15 +5298,10 @@ schedtune_cpu_margin(unsigned long util, int cpu) static inline long schedtune_task_margin(struct task_struct *task) { - int boost; + int boost = schedtune_task_boost(task); unsigned long util; long margin; -#ifdef CONFIG_CGROUP_SCHEDTUNE - boost = schedtune_task_boost(task); -#else - boost = get_sysctl_sched_cfs_boost(); -#endif if (boost == 0) return 0; |