x86, UV: Allow for non-consecutive sockets

Fix for the topology in which there is a socket 1 on a blade
with no socket 0.

Only call make_per_cpu_thp() for present sockets.
We have only seen this fail for internal configurations.

Signed-off-by: Cliff Wickman <cpw@sgi.com>
Link: http://lkml.kernel.org/r/20110621122242.363757364@sgi.com
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index 34be6509330956fa9e990147ae6fd39045ac4a11..7623b08eab1e8a54802e4ca96f51cda108462e9e 100644 (file)
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -1752,10 +1752,10 @@ static int __init summarize_uvhub_sockets(int nuvhubs,
                                sdp = &bdp->socket[socket];
                                if (scan_sock(sdp, bdp, &smaster, &hmaster))
                                        return 1;
+                               make_per_cpu_thp(smaster);
                        }
                        socket++;
                        socket_mask = (socket_mask >> 1);
-                       make_per_cpu_thp(smaster);
                }
        }
        return 0;