diff options
| author | Dimitri Sivanich <sivanich@sgi.com> | 2014-03-31 10:23:20 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-01 12:10:45 +0200 |
| commit | fe455b17de6c881eecf4f9784c3b0483a5e3d19e (patch) | |
| tree | 2be46eb75be39724b1566d92c5895630236b7d24 /drivers/misc | |
| parent | 5f40f7d93898a473eb222aa8064144c1d6835470 (diff) | |
| download | blackbird-op-linux-fe455b17de6c881eecf4f9784c3b0483a5e3d19e.tar.gz blackbird-op-linux-fe455b17de6c881eecf4f9784c3b0483a5e3d19e.zip | |
x86/UV: Fix conditional in gru_exit()
Fix supported system conditional in gru_exit(), in preparation for UV3.
Signed-off-by: Dimitri Sivanich <sivanich@sgi.com>
Link: http://lkml.kernel.org/r/20140331152320.GA31495@sgi.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/sgi-gru/grufile.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/misc/sgi-gru/grufile.c b/drivers/misc/sgi-gru/grufile.c index 0535d1e0bc78..104a05f6b738 100644 --- a/drivers/misc/sgi-gru/grufile.c +++ b/drivers/misc/sgi-gru/grufile.c @@ -6,7 +6,7 @@ * This file supports the user system call for file open, close, mmap, etc. * This also incudes the driver initialization code. * - * Copyright (c) 2008 Silicon Graphics, Inc. All Rights Reserved. + * Copyright (c) 2008-2014 Silicon Graphics, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -58,6 +58,11 @@ static int max_user_cbrs, max_user_dsr_bytes; static struct miscdevice gru_miscdev; +static int gru_supported(void) +{ + return is_uv_system() && + (uv_hub_info->hub_revision < UV3_HUB_REVISION_BASE); +} /* * gru_vma_close @@ -518,7 +523,7 @@ static int __init gru_init(void) { int ret; - if (!is_uv_system() || (is_uvx_hub() && !is_uv2_hub())) + if (!gru_supported()) return 0; #if defined CONFIG_IA64 @@ -573,7 +578,7 @@ exit0: static void __exit gru_exit(void) { - if (!is_uv_system()) + if (!gru_supported()) return; gru_teardown_tlb_irqs(); |
