This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via a755eba66cb49c99d5a41b537dc9b730b679caf8 (commit) from bdd8c149c5077bd0d7abc2a167eaf2670a03fec4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/a755eba66cb49c99d5a41b537dc9b730b6... commit a755eba66cb49c99d5a41b537dc9b730b679caf8 Author: Pavan Balaji <[email protected]> Date: Fri May 3 22:14:06 2013 -0500 Pull in r5559 from hwloc-upstream. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c b/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c index 708ed83..05f65c4 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c @@ -143,9 +143,10 @@ hwloc_fallback_nbprocessors(struct hwloc_topology *topology) { host_info(mach_host_self(), HOST_BASIC_INFO, (integer_t*) &info, &count); n = info.avail_cpus; #elif defined(HAVE_SYSCTLBYNAME) - int64_t n; - if (hwloc_get_sysctlbyname("hw.ncpu", &n)) - n = -1; + int64_t nn; + if (hwloc_get_sysctlbyname("hw.ncpu", &nn)) + nn = -1; + n = nn; #elif defined(HAVE_SYSCTL) && HAVE_DECL_CTL_HW && HAVE_DECL_HW_NCPU static int name[2] = {CTL_HW, HW_NPCU}; if (hwloc_get_sysctl(name, sizeof(name)/sizeof(*name)), &n) ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository