lkml.org 
[lkml]   [2014]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: [PATCH] x86/UV: Fix conditional in gru_exit
On Mon, Mar 31, 2014 at 09:25:05AM +0200, Ingo Molnar wrote:
> * Dimitri Sivanich <sivanich@sgi.com> wrote:
>
> > +static int gru_unsupported(void)
> > +{
> > + return !is_uv_system() || (is_uvx_hub() && !is_uv2_hub());
> > +}
>
> So the usual pattern is to introduce simple patterns, without logic
> operations in their name. I.e. "gru_supported()" would be more natural
> than "gru_not_supported()" or gru_unsupported()".
>

OK. Here's a revised version.



Fix supported system conditional in gru_exit.

Signed-off-by: Dimitri Sivanich <sivanich@sgi.com>
---
drivers/misc/sgi-gru/grufile.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)

Index: linux/drivers/misc/sgi-gru/grufile.c
===================================================================
--- linux.orig/drivers/misc/sgi-gru/grufile.c
+++ linux/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_b

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

\
 
 \ /
  Last update: 2014-03-31 18:02    [W:0.070 / U:0.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site