Skip to content

Commit

Permalink
x86, UV: Allow for non-consecutive sockets
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
cpw@sgi.com authored and Ingo Molnar committed Jun 21, 2011
1 parent b18fb2c commit 9c9153d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/x86/platform/uv/tlb_uv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9c9153d

Please sign in to comment.