[tip:x86/uv] x86, uv, uv3: Check current gru hub support for SGI UV3

tip-bot for Mike Travis
2013-02-12T04:22:58Z

Commit-ID: 385404e0ce4dbceb72f3f89cb172b2e60ef8e6d3
Gitweb: http://git.kernel.org/tip/385404e0ce4dbceb72f3f89cb172b2e60ef8e6d3
Author: Mike Travis <travis@sgi.com>
AuthorDate: Mon, 11 Feb 2013 13:45:14 -0600
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Mon, 11 Feb 2013 17:18:19 -0800

x86, uv, uv3: Check current gru hub support for SGI UV3

This patch checks current hub support to avoid panicing the
system until all the GRU changes for UV3+ are in place.

Signed-off-by: Mike Travis <travis@sgi.com>
Link: http://lkml.kernel.org/r/20130211194509.035828372@gulag1.americas.sgi.com
Acked-by: Dimitri Sivanich <sivanich@sgi.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
drivers/misc/sgi-gru/grufile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c
index 492c8ca..44d273c 100644
--- a/drivers/misc/sgi-gru/grufile.c
+++ b/drivers/misc/sgi-gru/grufile.c
@@ -517,7 +517,7 @@ static int __init gru_init(void)
{
int ret;

- if (!is_uv_system())
+ if (!is_uv_system() || (is_uvx_hub() && !is_uv2_hub()))
return 0;

#if defined CONFIG_IA64