Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58d4ab46 authored by Andrew Banman's avatar Andrew Banman Committed by Ingo Molnar
Browse files

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



Signed-off-by: default avatarAndrew Banman <abanman@sgi.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarMike Travis <travis@sgi.com>
Acked-by: default avatarDimitri Sivanich <sivanich@sgi.com>
Acked-by: default avatarThomas 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: default avatarIngo Molnar <mingo@kernel.org>
parent 21e3f12f

arch/x86/platform/uv/tlb_uv.c

+3 −1
Original line number Diff line number Diff line
@@ -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;