Re: [PATCH] x86/UV: Fix conditional in gru_exit

[Ingo Molnar <mingo@kernel.org>]

* Dimitri Sivanich <sivanich@sgi.com> wrote:

> Fix conditional in gru_exit to match gru_init.
> 
> Signed-off-by: Dimitri Sivanich <sivanich@sgi.com>
> ---
>  drivers/misc/sgi-gru/grufile.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux/drivers/misc/sgi-gru/grufile.c
> ===================================================================
> --- linux.orig/drivers/misc/sgi-gru/grufile.c
> +++ linux/drivers/misc/sgi-gru/grufile.c
> @@ -573,7 +573,7 @@ exit0:
>  
>  static void __exit gru_exit(void)
>  {
> -	if (!is_uv_system())
> +	if (!is_uv_system() || (is_uvx_hub() && !is_uv2_hub()))
>  		return;

Such an amalgation of three system specific conditionals is 
disgusting, please at minimum factor out a helper routine so that such 
mismatches cannot happen.

Thanks,

	Ingo