Wed, 02 Dec 2015 23:14:02 -0800
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Thu Oct 29 17:31:50 2015 -0700 1.2 +++ b/.hgtags Wed Dec 02 23:14:02 2015 -0800 1.3 @@ -670,6 +670,7 @@ 1.4 20bad8c6c7b406c3603b4e22b15cd990840a9d62 jdk8u51-b31 1.5 e51afd2a1fc17de59ff3c79003210a40a28ac960 jdk8u51-b32 1.6 b2427357cc98aeb2716ee2e89e733794afb4057b jdk8u51-b33 1.7 +4b722db6d38583ee3e71c43d9996bf1ebb8a412e jdk8u51-b34 1.8 d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u60-b00 1.9 d9349fa8822336e0244da0a8448f3e6b2d62741d hs25.60-b00 1.10 ebf89088c08ab0508b9002b48dd3d68a340259af hs25.60-b01 1.11 @@ -761,8 +762,11 @@ 1.12 5b67af3317bce1f940c5dc1535411a1002bed6c1 jdk8u66-b15 1.13 4bbf0e9196f2786e0bc4f17664e2533808d944bf jdk8u66-b16 1.14 a6f2a7ba281291f5dab79fa494f7cfaa6232c88b jdk8u66-b17 1.15 +9ae2a5adabba97d9ebf79e13b325f1ff368ce014 jdk8u66-b18 1.16 527f62b70faee4a0c15f365def024b87012e6934 jdk8u66-b31 1.17 d8be40462cfb6de441818aec8c30e03077189010 jdk8u66-b32 1.18 +6a0b19c56d797c2975f0cf505190e8f5d69b0b7a jdk8u66-b33 1.19 +3d55b1055c782375e39ebbddba2887379bc3531c jdk8u66-b34 1.20 9a158a0c243beb610dbaabd63d6218d3ce5825f1 jdk8u71-b00 1.21 67df26e363fb7e722032fd286673642fc999957c jdk8u71-b01 1.22 1a799d49de23d84f658ade1d3805a1924e7e1e84 jdk8u71-b02 1.23 @@ -770,6 +774,11 @@ 1.24 7466029bf3cd3d5eea3055c4f790728263be4a2e jdk8u71-b04 1.25 8a402d51763c083151d0cb434647bd6e1ba4353f jdk8u71-b05 1.26 7dd34cca3538c9bef74a8a1976e14ca51e9857f9 jdk8u71-b06 1.27 +bf9d01d1dc6c58b52cb2d0fb07820c51b62c3827 jdk8u71-b07 1.28 +19d7052b56715803f40e39aaff00d34ca71f5bc3 jdk8u71-b08 1.29 +4fb1acaab7a3205277fa21b083694f1bbb9ae957 jdk8u71-b09 1.30 +db019338ef0b6c0ed98c4804c11e07fbee4c6b4c jdk8u71-b10 1.31 +9905af25dff7d5bbc73356f5bd14aa10f691a050 jdk8u71-b11 1.32 b8f426369187c32551f0a3d571d933908988c81c jdk8u72-b00 1.33 c0205eddb31766ece562483595ec28a7506971e9 jdk8u72-b01 1.34 15ef554f2f2e0a8d7c330191432fcd2126d19dab jdk8u72-b02 1.35 @@ -777,4 +786,9 @@ 1.36 6c8ceb05ccf78f2f8f72f0870e3f6f3bd4895bb1 jdk8u72-b04 1.37 a2969911663ab29c71a61aa3403e53243ad89923 jdk8u72-b05 1.38 acf0d80cb84f14d787c34360abf2bc38b186999a jdk8u72-b06 1.39 +a382a72730f480078af5454afe782de9b6c210d3 jdk8u72-b07 1.40 +f26ad2273cd42cde957084ee953a9dc1a2598b5d jdk8u72-b08 1.41 +defd2b9a94584d372dea05272ad4f1d6a662c5d1 jdk8u72-b09 1.42 +78b0df74e3743be0b578c63e209a03685136d1fa jdk8u72-b10 1.43 +37a99b0f443e45fbd0b0a3ed844e6c97d661b754 jdk8u72-b11 1.44 c0242ea4bde19d72be5149feda112a39e8c89b0a jdk8u75-b00
2.1 --- a/src/cpu/x86/vm/vm_version_x86.hpp Thu Oct 29 17:31:50 2015 -0700 2.2 +++ b/src/cpu/x86/vm/vm_version_x86.hpp Wed Dec 02 23:14:02 2015 -0800 2.3 @@ -592,7 +592,7 @@ 2.4 result = _cpuid_info.std_cpuid1_ebx.bits.threads_per_cpu / 2.5 cores_per_cpu(); 2.6 } 2.7 - return result; 2.8 + return (result == 0 ? 1 : result); 2.9 } 2.10 2.11 static intx prefetch_data_size() {