* Fix some comments.

* Use the hwloc logical index, not the os_index.  Fixes problems with
   opal_hwloc_base_cset2str() output (e.g., --report-bindings output)
   on machines where the os_index is not tightly packed in the range
   ![0, n-1]

This commit was SVN r27394.

opal/mca/hwloc/base/hwloc_base_util.c

@@ -1701,10 +1701,10 @@ static int build_map(int *num_sockets_arg, int *num_cores_arg,
     /* Find out how many sockets we have (cached so that we don't have
        to look this up every time) */
     if (num_sockets < 0) {
-        num_sockets = hwloc_get_nbobjs_by_type(opal_hwloc_topology, HWLOC_OBJ_CORE);
+        num_sockets = hwloc_get_nbobjs_by_type(opal_hwloc_topology, HWLOC_OBJ_SOCKET);
 
         /* Lazy: take the total number of cores that we have in the
-           topology; that'll be less than the max number of cores
+           topology; that'll be more than the max number of cores
            under any given socket */
         num_cores = hwloc_get_nbobjs_by_type(opal_hwloc_topology, HWLOC_OBJ_CORE);
     }
@@ -1742,7 +1742,7 @@ static int build_map(int *num_sockets_arg, int *num_cores_arg,
         }
         core_index = 0;
         if (NULL != core) {
-            core_index = core->os_index;
+            core_index = core->logical_index;
         }
 
         /* Go upward and find the socket this PU belongs to */
@@ -1752,7 +1752,7 @@ static int build_map(int *num_sockets_arg, int *num_cores_arg,
         }
         socket_index = 0;
         if (NULL != socket) {
-            socket_index = socket->os_index;
+            socket_index = socket->logical_index;
         }
 
         /* Save this socket/core/pu combo.  LAZY: Assuming that we
@@ -1782,7 +1782,7 @@ int opal_hwloc_base_cset2str(char *str, int len, hwloc_cpuset_t cpuset)
         return ret;
     }
 
-    /* Iterate over the data maxtrix and build up the string */
+    /* Iterate over the data matrix and build up the string */
     first = true;
     for (socket_index = 0; socket_index < num_sockets; ++socket_index) {
         for (core_index = 0; core_index < num_cores; ++core_index) {