iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/UV: Fix conditional in gru_exit()

Browse Source 
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>
This commit is contained in:
Dimitri Sivanich 2014-03-31 10:23:20 -05:00 committed by Ingo Molnar
parent 5f40f7d938
commit fe455b17de
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/misc/sgi-gru/grufile.c
View File

@ -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();