# HG changeset patch
# User vkempik
# Date 1417443765 -14400
# Node ID a8c8adf853c277a1d09843c70cb66c99bbec5ab2
# Parent  c3933f52eeb33f70ee562464edddfe9f01d944fd
8058935: CPU detection gives 0 cores per cpu, 2 threads per core in Amazon EC2 environment
Reviewed-by: kvn, dsamersoff

diff -r c3933f52eeb3 -r a8c8adf853c2 src/cpu/x86/vm/vm_version_x86.hpp
--- a/src/cpu/x86/vm/vm_version_x86.hpp	Wed Dec 17 10:43:38 2014 -0800
+++ b/src/cpu/x86/vm/vm_version_x86.hpp	Mon Dec 01 18:22:45 2014 +0400
@@ -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()) {