--- a/hotspot/src/cpu/x86/vm/vm_version_x86.hpp	Fri Oct 30 06:50:55 2015 +0000
+++ b/hotspot/src/cpu/x86/vm/vm_version_x86.hpp	Fri Oct 30 08:29:19 2015 -0700
@@ -652,7 +652,7 @@
       result = _cpuid_info.std_cpuid1_ebx.bits.threads_per_cpu /
                cores_per_cpu();
     }
-    return result;
+    return (result == 0 ? 1 : result);
   }
 
   static intx L1_line_size()  {