Skip to content

Commit 27f6af2

Browse files
Joel Fernandespundiramit
authored andcommitted
sched/core: fix have_sched_energy_data build warning
have_sched_energy_data is defined only for CONFIG_SMP, so declare it only with CONFIG_SMP. Fixes warning from intel bot: tree: https://android.googlesource.com/kernel/msm android-4.4 head: a212997 commit: a212997 [5/5] sched/core: Warn if ENERGY_AWARE is enabled but data is missing config: i386-randconfig-x002-201743 (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: git checkout a212997 # save the attached .config to linux build tree make ARCH=i386 All warnings (new ones prefixed by >>): >> kernel//sched/core.c:94:13: warning: 'have_sched_energy_data' used but never defined static bool have_sched_energy_data(void); ^~~~~~~~~~~~~~~~~~~~~~ vim +/have_sched_energy_data +94 kernel//sched/core.c 93 > 94 static bool have_sched_energy_data(void); 95 Change-Id: I266b63ece6fb31d2b5b11821a8244e147ba6d3a4 Signed-off-by: Joel Fernandes <joelaf@google.com>
1 parent 3dcbf5e commit 27f6af2

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

kernel/sched/core.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@
9191
#include <trace/events/sched.h>
9292
#include "walt.h"
9393

94+
#ifdef CONFIG_SMP
9495
static bool have_sched_energy_data(void);
96+
#endif
9597

9698
DEFINE_MUTEX(sched_domains_mutex);
9799
DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);
@@ -195,10 +197,11 @@ static int sched_feat_set(char *cmp)
195197
sysctl_sched_features &= ~(1UL << i);
196198
sched_feat_disable(i);
197199
} else {
200+
#ifdef CONFIG_SMP
198201
if (i == __SCHED_FEAT_ENERGY_AWARE)
199202
WARN(!have_sched_energy_data(),
200203
"Missing sched energy data\n");
201-
204+
#endif
202205
sysctl_sched_features |= (1UL << i);
203206
sched_feat_enable(i);
204207
}

0 commit comments

Comments
 (0)