Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authordholmes
Wed, 07 Sep 2016 23:17:24 +0200
changeset 40930 3ef70f1039da
parent 40928 9a72c96b0c48 (current diff)
parent 40929 de043f8e5c04 (diff)
child 40931 d4d2a4a0e023
Merge
--- a/hotspot/src/os/linux/vm/os_linux.cpp	Wed Sep 07 19:29:01 2016 +0000
+++ b/hotspot/src/os/linux/vm/os_linux.cpp	Wed Sep 07 23:17:24 2016 +0200
@@ -2875,7 +2875,7 @@
                               // in the library.
   const size_t BitsPerCLong = sizeof(long) * CHAR_BIT;
 
-  size_t cpu_num = os::active_processor_count();
+  size_t cpu_num = processor_count();
   size_t cpu_map_size = NCPUS / BitsPerCLong;
   size_t cpu_map_valid_size =
     MIN2((cpu_num + BitsPerCLong - 1) / BitsPerCLong, cpu_map_size);
jdk-sandbox