Commit-ID: 58d4ab46f21e7e800a7597f271a23ec602796247 Gitweb: http://git.kernel.org/tip/58d4ab46f21e7e800a7597f271a23ec602796247 Author: Andrew Banman <aban...@sgi.com> AuthorDate: Wed, 21 Sep 2016 11:09:18 -0500 Committer: Ingo Molnar <mi...@kernel.org> 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 <aban...@sgi.com> Acked-by: Thomas Gleixner <t...@linutronix.de> Acked-by: Mike Travis <tra...@sgi.com> Acked-by: Dimitri Sivanich <sivan...@sgi.com> Acked-by: Thomas Gleixner <t...@linutronix.de> Cc: Linus Torvalds <torva...@linux-foundation.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: a...@linux-foundation.org Cc: r...@sgi.com Link: http://lkml.kernel.org/r/1474474161-265604-8-git-send-email-aban...@sgi.com Signed-off-by: Ingo Molnar <mi...@kernel.org> --- 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;
