---

yaml --- r: 344813 b: refs/heads/master c: 3105b86 h: refs/heads/master i: 344811: 1166189 v: v3
git-mirror · Dec 11, 2012 · d54f384 · d54f384
1 parent ed6fba7
commit d54f384
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git 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
@@ -1558,13 +1558,22 @@ static void __sched_fork(struct task_struct *p)
 }
 
 #ifdef CONFIG_NUMA_BALANCING
+#ifdef CONFIG_SCHED_DEBUG
 void set_numabalancing_state(bool enabled)
 {
 	if (enabled)
 		sched_feat_set("NUMA");
 	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
@@ -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)
 {