sched/fair: fix building without CGROUP_SCHEDTUNE
authorHuang, Tao <huangtao@rock-chips.com>
Wed, 12 Jul 2017 13:03:19 +0000 (21:03 +0800)
committerHuang, Tao <huangtao@rock-chips.com>
Wed, 12 Jul 2017 13:05:48 +0000 (21:05 +0800)
Fixes: e00ebdcb8a7c ("sched/tune: don't use schedtune before it is ready")
Change-Id: I86312b6d271365cfb94e6ca570771a6bca46e67b
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
kernel/sched/fair.c

index 78b9586ae51c387437e09a844ef90b72343af9f5..84c0d8084dc5a5a3a49cac0641442639c403df57 100644 (file)
@@ -5597,7 +5597,9 @@ static inline int __energy_diff(struct energy_env *eenv)
 #ifdef CONFIG_SCHED_TUNE
 
 struct target_nrg schedtune_target_nrg;
+#ifdef CONFIG_CGROUP_SCHEDTUNE
 extern bool schedtune_initialized;
+#endif
 /*
  * System energy normalization
  * Returns the normalized value, in the range [0..SCHED_CAPACITY_SCALE],
@@ -5608,9 +5610,11 @@ normalize_energy(int energy_diff)
 {
        u32 normalized_nrg;
 
+#ifdef CONFIG_CGROUP_SCHEDTUNE
        /* during early setup, we don't know the extents */
        if (unlikely(!schedtune_initialized))
                return energy_diff < 0 ? -1 : 1 ;
+#endif
 
 #ifdef CONFIG_SCHED_DEBUG
        {