projects
/
GitHub
/
moto-9609
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
21e3f12
)
x86/platform/uv/BAU: Populate ->uvhub_version with UV4 version information
author
Andrew Banman
<abanman@sgi.com>
Wed, 21 Sep 2016 16:09:18 +0000
(11:09 -0500)
committer
Ingo Molnar
<mingo@kernel.org>
Thu, 22 Sep 2016 09:16:14 +0000
(11:16 +0200)
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>
arch/x86/platform/uv/tlb_uv.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/x86/platform/uv/tlb_uv.c
b/arch/x86/platform/uv/tlb_uv.c
index 030d452c0b68143a263d00b7501e8572242a232d..ddbeb1679b1ac438abd452baeed44e54106d6459 100644
(file)
--- 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;