[PATCH 6/9] arch/x86/platform/uv: BAU UV4 populate uvhub_version

2016-09-20 Thread Andrew Banman
Signed-off-by: Andrew Banman 
Acked-by: Mike Travis 
Acked-by: Dimitri Sivanich 
---
 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 bfeb382..67a31d0 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;
-- 
1.8.5.6



[PATCH 6/9] arch/x86/platform/uv: BAU UV4 populate uvhub_version

2016-09-20 Thread Andrew Banman
Signed-off-by: Andrew Banman 
Acked-by: Mike Travis 
Acked-by: Dimitri Sivanich 
---
 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 bfeb382..67a31d0 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;
-- 
1.8.5.6