---

 src/libplpa/plpa_map.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --quilt old/src/libplpa/plpa_map.c new/src/libplpa/plpa_map.c
--- old/src/libplpa/plpa_map.c
+++ new/src/libplpa/plpa_map.c
@@ -238,15 +238,15 @@ static void load_cache(void)
 
         /* Compute some globals */
         if (map_processor_id_to_tuple[i].socket > max_socket) {
             max_socket = map_processor_id_to_tuple[i].socket;
         }
-        if (map_processor_id_to_tuple[i].core > max_core[i]) {
-            max_core[i] = map_processor_id_to_tuple[i].core;
+        if (map_processor_id_to_tuple[i].core > max_core[map_processor_id_to_tuple[i].socket]) {
+            max_core[map_processor_id_to_tuple[i].socket] = map_processor_id_to_tuple[i].core;
         }
-        if (max_core[i] > max_core_overall) {
-            max_core_overall = max_core[i];
+        if (max_core[map_processor_id_to_tuple[i].socket] > max_core_overall) {
+            max_core_overall = max_core[map_processor_id_to_tuple[i].socket];
         }
     }
 
     /* Now go through and build the map in the other direction:
        (socket,core) => processor_id.  This map simply points to