# HG changeset patch
# User kevinw
# Date 1418896375 0
# Node ID f06c27e55164904306c81e304d00dd92b96dc248
# Parent  a8c8adf853c277a1d09843c70cb66c99bbec5ab2# Parent  5217ec74ac635a6baa39e6fe0d6a49884bda0a75
Merge

diff -r 5217ec74ac63 -r f06c27e55164 src/cpu/x86/vm/vm_version_x86.hpp
--- a/src/cpu/x86/vm/vm_version_x86.hpp	Thu Dec 18 08:54:32 2014 +0000
+++ b/src/cpu/x86/vm/vm_version_x86.hpp	Thu Dec 18 09:52:55 2014 +0000
@@ -570,10 +570,12 @@
   static uint cores_per_cpu()  {
     uint result = 1;
     if (is_intel()) {
-      if (supports_processor_topology()) {
+      bool supports_topology = supports_processor_topology();
+      if (supports_topology) {
         result = _cpuid_info.tpl_cpuidB1_ebx.bits.logical_cpus /
                  _cpuid_info.tpl_cpuidB0_ebx.bits.logical_cpus;
-      } else {
+      }
+      if (!supports_topology || result == 0) {
         result = (_cpuid_info.dcp_cpuid4_eax.bits.cores_per_cpu + 1);
       }
     } else if (is_amd()) {