From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757111AbcIVKcI (ORCPT ); Thu, 22 Sep 2016 06:32:08 -0400 Received: from terminus.zytor.com ([198.137.202.10]:51884 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757050AbcIVKcF (ORCPT ); Thu, 22 Sep 2016 06:32:05 -0400 Date: Thu, 22 Sep 2016 03:31:31 -0700 From: tip-bot for Andrew Banman Message-ID: Cc: mingo@kernel.org, sivanich@sgi.com, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, travis@sgi.com, peterz@infradead.org, abanman@sgi.com, hpa@zytor.com Reply-To: abanman@sgi.com, peterz@infradead.org, hpa@zytor.com, travis@sgi.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, sivanich@sgi.com, mingo@kernel.org, torvalds@linux-foundation.org In-Reply-To: <1474474161-265604-8-git-send-email-abanman@sgi.com> References: <1474474161-265604-8-git-send-email-abanman@sgi.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/platform] x86/platform/uv/BAU: Populate ->uvhub_version with UV4 version information Git-Commit-ID: 58d4ab46f21e7e800a7597f271a23ec602796247 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 58d4ab46f21e7e800a7597f271a23ec602796247 Gitweb: http://git.kernel.org/tip/58d4ab46f21e7e800a7597f271a23ec602796247 Author: Andrew Banman AuthorDate: Wed, 21 Sep 2016 11:09:18 -0500 Committer: Ingo Molnar CommitDate: Thu, 22 Sep 2016 11:16:14 +0200 x86/platform/uv/BAU: Populate ->uvhub_version with UV4 version information Signed-off-by: Andrew Banman Acked-by: Thomas Gleixner Acked-by: Mike Travis Acked-by: Dimitri Sivanich Acked-by: Thomas Gleixner Cc: Linus Torvalds Cc: Peter Zijlstra Cc: akpm@linux-foundation.org Cc: rja@sgi.com Link: http://lkml.kernel.org/r/1474474161-265604-8-git-send-email-abanman@sgi.com Signed-off-by: Ingo Molnar --- arch/x86/platform/uv/tlb_uv.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c index 030d452..ddbeb16 100644 --- a/arch/x86/platform/uv/tlb_uv.c +++ b/arch/x86/platform/uv/tlb_uv.c @@ -2044,8 +2044,10 @@ static int scan_sock(struct socket_desc *sdp, struct uvhub_desc *bdp, bcp->uvhub_version = 2; else if (is_uv3_hub()) bcp->uvhub_version = 3; + else if (is_uv4_hub()) + bcp->uvhub_version = 4; else { - pr_emerg("uvhub version not 1, 2, or 3\n"); + pr_emerg("uvhub version not 1, 2, 3, or 4\n"); return 1; } bcp->uvhub_master = *hmasterp;