Messages in this thread Patch in this message | | | Date | Tue, 21 Jun 2011 15:17:10 GMT | From | "tip-bot for " <> | Subject | [tip:x86/uv] x86, UV: Allow for non-consecutive sockets |
| |
Commit-ID: 9c9153db22870c3f37add83bea30500fcc268a73 Gitweb: http://git.kernel.org/tip/9c9153db22870c3f37add83bea30500fcc268a73 Author: cpw@sgi.com <cpw@sgi.com> AuthorDate: Tue, 21 Jun 2011 07:21:28 -0500 Committer: Ingo Molnar <mingo@elte.hu> CommitDate: Tue, 21 Jun 2011 14:50:32 +0200
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> --- 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 34be650..7623b08 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;
| |