diff options
| author | Mike Travis <travis@sgi.com> | 2013-02-11 13:45:14 -0600 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-02-11 17:18:19 -0800 |
| commit | 385404e0ce4dbceb72f3f89cb172b2e60ef8e6d3 (patch) | |
| tree | 133211e3fe1f1e9cc272aea7899e2119f7814f17 /drivers/misc/sgi-gru | |
| parent | 0af6352045a3bf359a2d5f55965266d67d262b47 (diff) | |
| download | linux-385404e0ce4dbceb72f3f89cb172b2e60ef8e6d3.tar.bz2 | |
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>
Diffstat (limited to 'drivers/misc/sgi-gru')
| -rw-r--r-- | drivers/misc/sgi-gru/grufile.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c index 492c8cac69ac..44d273c5e19d 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 |