From 324d51aa22ffeff1e4a090251769aa4c565b30fe Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Tue, 31 Aug 2010 10:28:15 +0200
Subject: [PATCH] --- yaml --- r: 211963 b: refs/heads/master c:
 f269893c575167447cc9f6d1867e639fb5b6f0c5 h: refs/heads/master i:   211961:
 00113fbbe62eca829c1d1acbc81e091048fa3647   211959:
 aeab0f910ca5a5c5c6d9318708f80a9514f21c68 v: v3

---
 [refs]               |  2 +-
 trunk/kernel/sched.c | 18 +++++-------------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 9b712aa3a733..d2da11c39e0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed2d372c0738386b8a184a6a6bea9c16df6ffb68
+refs/heads/master: f269893c575167447cc9f6d1867e639fb5b6f0c5
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index 8eef8e5512d4..1a0c084b1cf9 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -6552,31 +6552,23 @@ cpu_to_cpu_group(int cpu, const struct cpumask *cpu_map,
 #ifdef CONFIG_SCHED_MC
 static DEFINE_PER_CPU(struct static_sched_domain, core_domains);
 static DEFINE_PER_CPU(struct static_sched_group, sched_group_core);
-#endif /* CONFIG_SCHED_MC */
 
-#if defined(CONFIG_SCHED_MC) && defined(CONFIG_SCHED_SMT)
 static int
 cpu_to_core_group(int cpu, const struct cpumask *cpu_map,
 		  struct sched_group **sg, struct cpumask *mask)
 {
 	int group;
-
+#ifdef CONFIG_SCHED_SMT
 	cpumask_and(mask, topology_thread_cpumask(cpu), cpu_map);
 	group = cpumask_first(mask);
+#else
+	group = cpu;
+#endif
 	if (sg)
 		*sg = &per_cpu(sched_group_core, group).sg;
 	return group;
 }
-#elif defined(CONFIG_SCHED_MC)
-static int
-cpu_to_core_group(int cpu, const struct cpumask *cpu_map,
-		  struct sched_group **sg, struct cpumask *unused)
-{
-	if (sg)
-		*sg = &per_cpu(sched_group_core, cpu).sg;
-	return cpu;
-}
-#endif
+#endif /* CONFIG_SCHED_MC */
 
 static DEFINE_PER_CPU(struct static_sched_domain, phys_domains);
 static DEFINE_PER_CPU(struct static_sched_group, sched_group_phys);