From c2f18159a2f3c2da04445fe4295da050e4a7a1d9 Mon Sep 17 00:00:00 2001
From: Joel Fernandes <joelaf@google.com>
Date: Mon, 30 Oct 2017 21:12:57 +0000
Subject: Revert "sched/core: fix have_sched_energy_data build warning"

This reverts commit a899b9085c8d5d581b214c24dc707466e8cb479f.

Reverting for now due to suspend warning issues.

Change-Id: I9387297b52552a73d5a253b9e8e4467b366479a5
---
 kernel/sched/core.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'kernel')

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 4e5298a1977e..4f11b84eaf0a 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -91,9 +91,7 @@
 #include <trace/events/sched.h>
 #include "walt.h"
 
-#ifdef CONFIG_SMP
 static bool have_sched_energy_data(void);
-#endif
 
 DEFINE_MUTEX(sched_domains_mutex);
 DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues);
@@ -197,11 +195,10 @@ static int sched_feat_set(char *cmp)
 				sysctl_sched_features &= ~(1UL << i);
 				sched_feat_disable(i);
 			} else {
-#ifdef CONFIG_SMP
 				if (i == __SCHED_FEAT_ENERGY_AWARE)
 					WARN(!have_sched_energy_data(),
 					     "Missing sched energy data\n");
-#endif
+
 				sysctl_sched_features |= (1UL << i);
 				sched_feat_enable(i);
 			}
-- 
cgit v1.2.3