shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

sched/{fair,tune}: simplify fair.c code

Browse Source 
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>
This commit is contained in:
Patrick Bellasi
2016-07-28 17:42:36 +01:00
committed by Amit Pundir
parent 6102e30f9d
commit 877bc05081
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/sched/fair.c
View File

@@ -5098,18 +5098,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;
@@ -5313,13 +5308,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;
@@ -5329,15 +5319,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;

6
kernel/sched/tune.h
View File

@@ -22,6 +22,9 @@ void schedtune_dequeue_task(struct task_struct *p, int cpu);
#else /* CONFIG_CGROUP_SCHEDTUNE */
#define schedtune_cpu_boost(cpu) get_sysctl_sched_cfs_boost()
#define schedtune_task_boost(tsk) get_sysctl_sched_cfs_boost()
#define schedtune_enqueue_task(task, cpu) do { } while (0)
#define schedtune_dequeue_task(task, cpu) do { } while (0)
@@ -33,6 +36,9 @@ int schedtune_accept_deltas(int nrg_delta, int cap_delta,
#else /* CONFIG_SCHED_TUNE */
#define schedtune_cpu_boost(cpu) 0
#define schedtune_task_boost(tsk) 0
#define schedtune_enqueue_task(task, cpu) do { } while (0)
#define schedtune_dequeue_task(task, cpu) do { } while (0)