---

yaml
---
r: 88873
b: refs/heads/master
c: 1cb6848
h: refs/heads/master
i:
  88871: bce2975
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9f6d8552a9cb49dc556777bbdf7ac8b3d7e18edb
+refs/heads/master: 1cb68487f5898dd97460e5b6bda9619ec3549361

trunk/arch/x86/kernel/apic_64.c

@@ -1209,7 +1209,7 @@ __cpuinit int apic_is_clustered_box(void)
 	 * will be [4, 0x23] or [8, 0x27] could be thought to
 	 * vsmp box still need checking...
 	 */
-	if (!is_vsmp_box() && (boot_cpu_data.x86_vendor == X86_VENDOR_AMD))
+	if ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) && !is_vsmp_box())
 		return 0;
 
 	bios_cpu_apicid = x86_bios_cpu_apicid_early_ptr;
@@ -1249,6 +1249,12 @@ __cpuinit int apic_is_clustered_box(void)
 			++zeros;
 	}
 
+	/* ScaleMP vSMPowered boxes have one cluster per board and TSCs are
+	 * not guaranteed to be synced between boards
+	 */
+	if (is_vsmp_box() && clusters > 1)
+		return 1;
+
 	/*
 	 * If clusters > 2, then should be multi-chassis.
 	 * May have to revisit this when multi-core + hyperthreaded CPUs come