diff options
| author | cpw@sgi.com <cpw@sgi.com> | 2011-06-21 07:21:28 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-06-21 14:50:32 +0200 |
| commit | 9c9153db22870c3f37add83bea30500fcc268a73 (patch) | |
| tree | d588b8868b05766ef144cbce3eee9f6c2df2253a | |
| parent | b18fb2c04ac46885f5b0226cd945e763eae51567 (diff) | |
| download | linux-9c9153db22870c3f37add83bea30500fcc268a73.tar.bz2 | |
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>
| -rw-r--r-- | arch/x86/platform/uv/tlb_uv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 34be65093309..7623b08eab1e 100644 --- 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; |