diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-26 10:24:53 -0800 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-26 10:24:53 -0800 |
| commit | 8ffa1ae93310646cdf1b15c3a8c2655268d1a47f (patch) | |
| tree | d3864d084b18db4e24b3bb21d56fbb49be20a34f /src/core/lib/gpr | |
| parent | 8b05d0284f6aaaa2a9567f992189bef91550a645 (diff) | |
| parent | 710704feac930ac38ae13986ad3899d4465adba4 (diff) | |
Merge branch 'master' into 2phase_thd
Diffstat (limited to 'src/core/lib/gpr')
| -rw-r--r-- | src/core/lib/gpr/cpu_linux.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/gpr/cpu_linux.cc b/src/core/lib/gpr/cpu_linux.cc index 4782f9f742..fda28916f8 100644 --- 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; |