linux-kernel - [tip:x86/platform] x86/platform/uv/BAU: Populate ->uvhub

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <tip-58d4ab46f21e7e800a7597f271a23ec602796247@git.kernel.org>
Date:   Thu, 22 Sep 2016 03:31:31 -0700
From:   tip-bot for Andrew Banman <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     mingo@...nel.org, sivanich@....com, torvalds@...ux-foundation.org,
        linux-kernel@...r.kernel.org, tglx@...utronix.de, travis@....com,
        peterz@...radead.org, abanman@....com, hpa@...or.com
Subject: [tip:x86/platform] x86/platform/uv/BAU: Populate ->uvhub_version
 with UV4 version information

Commit-ID:  58d4ab46f21e7e800a7597f271a23ec602796247
Gitweb:     http://git.kernel.org/tip/58d4ab46f21e7e800a7597f271a23ec602796247
Author:     Andrew Banman <abanman@....com>
AuthorDate: Wed, 21 Sep 2016 11:09:18 -0500
Committer:  Ingo Molnar <mingo@...nel.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 <abanman@....com>
Acked-by: Thomas Gleixner <tglx@...utronix.de>
Acked-by: Mike Travis <travis@....com>
Acked-by: Dimitri Sivanich <sivanich@....com>
Acked-by: Thomas Gleixner <tglx@...utronix.de>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: akpm@...ux-foundation.org
Cc: rja@....com
Link: http://lkml.kernel.org/r/1474474161-265604-8-git-send-email-abanman@sgi.com
Signed-off-by: Ingo Molnar <mingo@...nel.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;