From: Andrew Banman <abanman@sgi.com>
Date: Wed, 21 Sep 2016 16:09:18 +0000 (-0500)
Subject: x86/platform/uv/BAU: Populate ->uvhub_version with UV4 version information
X-Git-Tag: v4.1.12-92~3^2~40
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b64dd98df417477f4aeb9ac4c128c18c525dc8a9;p=users%2Fjedix%2Flinux-maple.git

x86/platform/uv/BAU: Populate ->uvhub_version with UV4 version information

Orabug: 25477822

Signed-off-by: Andrew Banman <abanman@sgi.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Mike Travis <travis@sgi.com>
Acked-by: Dimitri Sivanich <sivanich@sgi.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
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 <mingo@kernel.org>
(cherry picked from commit 58d4ab46f21e7e800a7597f271a23ec602796247)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index 030d452c0b681..ddbeb1679b1ac 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;