From d54f38416b56ac7c93921704585f336eb89e43e5 Mon Sep 17 00:00:00 2001
From: Mel Gorman <mgorman@suse.de>
Date: Fri, 23 Nov 2012 11:23:49 +0000
Subject: [PATCH] --- yaml --- r: 344813 b: refs/heads/master c:
 3105b86a9fee7d2c2e76edb53bbbc4027599628f h: refs/heads/master i:   344811:
 116618982faec08e6772022a1d9639d322bef04d v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/sched/core.c  | 9 +++++++++
 trunk/kernel/sched/sched.h | 8 +++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6f018b03f6c0..fbef13e83894 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a687c2e9a99335c9e77392f050fe607fa18a652
+refs/heads/master: 3105b86a9fee7d2c2e76edb53bbbc4027599628f
diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c
index 7a45015274ab..2a46f4407414 100644
--- a/trunk/kernel/sched/core.c
+++ b/trunk/kernel/sched/core.c
@@ -1558,6 +1558,7 @@ static void __sched_fork(struct task_struct *p)
 }
 
 #ifdef CONFIG_NUMA_BALANCING
+#ifdef CONFIG_SCHED_DEBUG
 void set_numabalancing_state(bool enabled)
 {
 	if (enabled)
@@ -1565,6 +1566,14 @@ void set_numabalancing_state(bool enabled)
 	else
 		sched_feat_set("NO_NUMA");
 }
+#else
+__read_mostly bool numabalancing_enabled;
+
+void set_numabalancing_state(bool enabled)
+{
+	numabalancing_enabled = enabled;
+}
+#endif /* CONFIG_SCHED_DEBUG */
 #endif /* CONFIG_NUMA_BALANCING */
 
 /*
diff --git a/trunk/kernel/sched/sched.h b/trunk/kernel/sched/sched.h
index ae31c051ff2f..4f93d031875a 100644
--- a/trunk/kernel/sched/sched.h
+++ b/trunk/kernel/sched/sched.h
@@ -650,9 +650,15 @@ extern struct static_key sched_feat_keys[__SCHED_FEAT_NR];
 
 #ifdef CONFIG_NUMA_BALANCING
 #define sched_feat_numa(x) sched_feat(x)
+#ifdef CONFIG_SCHED_DEBUG
+#define numabalancing_enabled sched_feat_numa(NUMA)
+#else
+extern bool numabalancing_enabled;
+#endif /* CONFIG_SCHED_DEBUG */
 #else
 #define sched_feat_numa(x) (0)
-#endif
+#define numabalancing_enabled (0)
+#endif /* CONFIG_NUMA_BALANCING */
 
 static inline u64 global_rt_period(void)
 {