Messages in this thread Patch in this message | | | Date | Tue, 21 Jun 2011 07:21:28 -0500 | From | cpw@sgi ... | Subject | [patch 3/8 v5] 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.
Signed-off-by: Cliff Wickman <cpw@sgi.com> ---
Only call make_per_cpu_thp() for present sockets. We have only seen this fail for internal configurations.
arch/x86/platform/uv/tlb_uv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Index: linux/arch/x86/platform/uv/tlb_uv.c =================================================================== --- linux.orig/arch/x86/platform/uv/tlb_uv.c +++ linux/arch/x86/platform/uv/tlb_uv.c @@ -1752,10 +1752,10 @@ static int __init summarize_uvhub_socket 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;
| |