From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760229Ab3BHSnJ (ORCPT ); Fri, 8 Feb 2013 13:43:09 -0500 Received: from relay1.sgi.com ([192.48.179.29]:54673 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758314Ab3BHSnH (ORCPT ); Fri, 8 Feb 2013 13:43:07 -0500 Message-Id: <20130208184306.212373913@gulag1.americas.sgi.com> User-Agent: quilt/0.47-1 Date: Fri, 08 Feb 2013 12:43:11 -0600 From: Mike Travis To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Cc: Andrew Morton , x86@kernel.org, linux-kernel@vger.kernel.org, Dimitri Sivanich Subject: [PATCH 6/7] x86, UV: UV3 Check current gru hub support. References: <20130208184305.132404589@gulag1.americas.sgi.com> Content-Disposition: inline; filename=uv3-update-gru-syscheck Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch checks current hub support to avoid panicing the system until all the GRU changes for UV3+ are in place. Signed-off-by: Dimitri Sivanich Signed-off-by: Mike Travis --- drivers/misc/sgi-gru/grufile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- linux.orig/drivers/misc/sgi-gru/grufile.c +++ linux/drivers/misc/sgi-gru/grufile.c @@ -517,7 +517,7 @@ static int __init gru_init(void) { int ret; - if (!is_uv_system()) + if (!is_uv_system() || (is_uvx_hub() && !is_uv2_hub())) return 0; #if defined CONFIG_IA64