From e77653511b3fae5440fbd7956a31cf925e7af974 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Fri, 24 Feb 2012 13:57:18 +0000 Subject: [PATCH] Bring in upstream hwloc v1.3 branch SVN commit r4345 This commit was SVN r26048. The following SVN revision numbers were found above: r4345 --> open-mpi/ompi@b6c2a5b60275728f1931dd3925e048da0abfbdc3 --- opal/mca/hwloc/hwloc132/README-ompi.txt | 1 + opal/mca/hwloc/hwloc132/hwloc/NEWS | 7 ++++++- opal/mca/hwloc/hwloc132/hwloc/src/bind.c | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/opal/mca/hwloc/hwloc132/README-ompi.txt b/opal/mca/hwloc/hwloc132/README-ompi.txt index 28b2ecfc3a..88b3df9e58 100644 --- a/opal/mca/hwloc/hwloc132/README-ompi.txt +++ b/opal/mca/hwloc/hwloc132/README-ompi.txt @@ -6,3 +6,4 @@ https://svn.open-mpi.org/trac/hwloc/changeset/4309 https://svn.open-mpi.org/trac/hwloc/changeset/4314 https://svn.open-mpi.org/trac/hwloc/changeset/4319 https://svn.open-mpi.org/trac/hwloc/changeset/4340 +https://svn.open-mpi.org/trac/hwloc/changeset/4345 diff --git a/opal/mca/hwloc/hwloc132/hwloc/NEWS b/opal/mca/hwloc/hwloc132/hwloc/NEWS index e0d49044e6..e9d1bb3efc 100644 --- a/opal/mca/hwloc/hwloc132/hwloc/NEWS +++ b/opal/mca/hwloc/hwloc132/hwloc/NEWS @@ -1,6 +1,6 @@ Copyright © 2009 CNRS Copyright © 2009-2011 inria. All rights reserved. -Copyright © 2009-2011 Université Bordeaux 1 +Copyright © 2009-2012 Université Bordeaux 1 Copyright © 2009-2011 Cisco Systems, Inc. All rights reserved. $COPYRIGHT$ @@ -17,6 +17,11 @@ bug fixes (and other actions) for each version of hwloc since version in v0.9.1). +Version 1.3.3 +------------- +* Bug fixes: + + Fix hwloc_alloc_membind, thanks Karl Napf for reporting the issue. + Version 1.3.2 ------------- * Fix missing last bit in hwloc_linux_get_thread_cpubind(). diff --git a/opal/mca/hwloc/hwloc132/hwloc/src/bind.c b/opal/mca/hwloc/hwloc132/hwloc/src/bind.c index a04d4b17eb..26fc4f9ffb 100644 --- a/opal/mca/hwloc/hwloc132/hwloc/src/bind.c +++ b/opal/mca/hwloc/hwloc132/hwloc/src/bind.c @@ -1,7 +1,7 @@ /* * Copyright © 2009 CNRS * Copyright © 2009-2011 inria. All rights reserved. - * Copyright © 2009-2010 Université Bordeaux 1 + * Copyright © 2009-2010, 2012 Université Bordeaux 1 * Copyright © 2011 Cisco Systems, Inc. All rights reserved. * See COPYING in top-level directory. */ @@ -534,7 +534,7 @@ hwloc_alloc_membind(hwloc_topology_t topology, size_t len, hwloc_const_cpuset_t hwloc_nodeset_t nodeset = hwloc_bitmap_alloc(); void *ret; - if (!hwloc_fix_membind_cpuset(topology, nodeset, set)) { + if (hwloc_fix_membind_cpuset(topology, nodeset, set)) { if (flags & HWLOC_MEMBIND_STRICT) ret = NULL; else