Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757066Ab1FPMPE (ORCPT ); Thu, 16 Jun 2011 08:15:04 -0400 Received: from relay2.sgi.com ([192.48.179.30]:47382 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757219Ab1FPMO7 (ORCPT ); Thu, 16 Jun 2011 08:14:59 -0400 To: linux-kernel@vger.kernel.org Subject: [PATCH 3/8 v3] x86, UV: allow for non-consecutive sockets Cc: mingo@elte.hu Message-Id: From: Cliff Wickman Date: Thu, 16 Jun 2011 07:16:11 -0500 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1140 Lines: 36 From: Cliff Wickman Fix for the theoretical case 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. Diffed against 3.0.0-rc3 Signed-off-by: Cliff Wickman --- 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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/