x86/sched: Enable cluster scheduling on Hybrid

With the SMT vs non-SMT balancing issues sorted, also enable the
cluster domain for Hybrid machines.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>

diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index e1aa2cd7734ba40825f83ecfe01e25fd41b8e5a4..4c314475cc13d35f5d2263820e5563ed455e4edb 100644 (file)
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -632,14 +632,9 @@ static void __init build_sched_topology(void)
        };
 #endif
 #ifdef CONFIG_SCHED_CLUSTER
-       /*
-        * For now, skip the cluster domain on Hybrid.
-        */
-       if (!cpu_feature_enabled(X86_FEATURE_HYBRID_CPU)) {
-               x86_topology[i++] = (struct sched_domain_topology_level){
-                       cpu_clustergroup_mask, x86_cluster_flags, SD_INIT_NAME(CLS)
-               };
-       }
+       x86_topology[i++] = (struct sched_domain_topology_level){
+               cpu_clustergroup_mask, x86_cluster_flags, SD_INIT_NAME(CLS)
+       };
 #endif
 #ifdef CONFIG_SCHED_MC
        x86_topology[i++] = (struct sched_domain_topology_level){