1
1

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@b6c2a5b602
Этот коммит содержится в:
Jeff Squyres 2012-02-24 13:57:18 +00:00
родитель 11b50156c3
Коммит e77653511b
3 изменённых файлов: 9 добавлений и 3 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -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().

Просмотреть файл

@ -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