Skip to content

Commit b3501ab

Browse files
Russ Weightpundiramit
authored andcommitted
sched/tune: access schedtune_initialized under CGROUP_SCHEDTUNE
schedtune_initialized is protected by CONFIG_CGROUP_SCHEDTUNE, but is being used without CONFIG_CGROUP_SCHEDTUNE being defined. Add appropriate ifdefs around the usage of schedtune_initialized to avoid a compilation error when CONFIG_CGROUP_SCHEDTUNE is not defined. Change-Id: Iab79bf053d74db3eeb84c09d71d43b4e39746ed2 Signed-off-by: Russ Weight <russell.h.weight@intel.com> Signed-off-by: Fei Yang <fei.yang@intel.com>
1 parent ab4dd38 commit b3501ab

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

kernel/sched/fair.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5668,7 +5668,11 @@ static inline int __energy_diff(struct energy_env *eenv)
56685668
#ifdef CONFIG_SCHED_TUNE
56695669

56705670
struct target_nrg schedtune_target_nrg;
5671+
5672+
#ifdef CONFIG_CGROUP_SCHEDTUNE
56715673
extern bool schedtune_initialized;
5674+
#endif /* CONFIG_CGROUP_SCHEDTUNE */
5675+
56725676
/*
56735677
* System energy normalization
56745678
* Returns the normalized value, in the range [0..SCHED_CAPACITY_SCALE],
@@ -5679,9 +5683,11 @@ normalize_energy(int energy_diff)
56795683
{
56805684
u32 normalized_nrg;
56815685

5686+
#ifdef CONFIG_CGROUP_SCHEDTUNE
56825687
/* during early setup, we don't know the extents */
56835688
if (unlikely(!schedtune_initialized))
56845689
return energy_diff < 0 ? -1 : 1 ;
5690+
#endif /* CONFIG_CGROUP_SCHEDTUNE */
56855691

56865692
#ifdef CONFIG_SCHED_DEBUG
56875693
{

0 commit comments

Comments
 (0)