Merge pull request open-mpi#587 from ggouaillardet/topic/v2.x/hwloc_cores_count

hwloc: do not count not allowed cores in df_search_cores

Author: jsquyres

opal/mca/hwloc/base/hwloc_base_util.c

@@ -492,6 +492,10 @@ static void df_search_cores(hwloc_obj_t obj, unsigned int *cnt)
             obj->userdata = (void*)data;
         }
         if (NULL == opal_hwloc_base_cpu_set) {
+            if (!hwloc_bitmap_isincluded(obj->cpuset, obj->allowed_cpuset)) {
+                /* do not count not allowed cores */
+                return;
+            }
             data->npus = 1;
         }
         *cnt += data->npus;