---

yaml --- r: 145713 b: refs/heads/master c: 2ff799d h: refs/heads/master i: 145711: 10ce076 v: v3
git-mirror · May 11, 2009 · 6a09406 · 6a09406
1 parent 56808c6
commit 6a09406
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7961386fe9596e6bf03d09948a73c5df9653325b
+refs/heads/master: 2ff799d3cff1ecb274049378b28120ee5c1c5e5f
diff --git a/trunk/arch/x86/include/asm/topology.h b/trunk/arch/x86/include/asm/topology.h
@@ -203,7 +203,8 @@ struct pci_bus;
 void x86_pci_root_bus_res_quirks(struct pci_bus *b);
 
 #ifdef CONFIG_SMP
-#define mc_capable()	(cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids)
+#define mc_capable()	((boot_cpu_data.x86_max_cores > 1) && \
+			(cpumask_weight(cpu_core_mask(0)) != nr_cpu_ids))
 #define smt_capable()			(smp_num_siblings > 1)
 #endif