Merge branch 'master' into 2phase_thd

7 years ago · 8ffa1ae933
parent 8b05d0284f 710704feac
commit 8ffa1ae933
1 changed files with 1 additions and 1 deletions
--- a/src/core/lib/gpr/cpu_linux.cc
+++ b/src/core/lib/gpr/cpu_linux.cc
@ -45,7 +45,7 @@ static void init_num_cpus() {
 #endif
  /* This must be signed. sysconf returns -1 when the number cannot be
     determined */
-  ncpus = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
+  ncpus = static_cast<int>(sysconf(_SC_NPROCESSORS_CONF));
  if (ncpus < 1) {
    gpr_log(GPR_ERROR, "Cannot determine number of CPUs: assuming 1");
    ncpus = 1;