From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 24 Sep 2013 07:52:40 +0000 (+0200)
Subject: x86/UV: Check for alloc_cpumask_var() failures properly in uv_nmi_setup()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8a1f4653f27ffd5d61088cf6b95c39bb13bf6132;p=linux-beck.git

x86/UV: Check for alloc_cpumask_var() failures properly in uv_nmi_setup()

GCC warned about:

   arch/x86/platform/uv/uv_nmi.c: In function ‘uv_nmi_setup’:
   arch/x86/platform/uv/uv_nmi.c:664:2: warning: the address of ‘uv_nmi_cpu_mask’ will always evaluate as ‘true’

The reason is this code:

        alloc_cpumask_var(&uv_nmi_cpu_mask, GFP_KERNEL);
        BUG_ON(!uv_nmi_cpu_mask);

which is not the way to check for alloc_cpumask_var() failures - its
return code should be checked instead.

Cc: Mike Travis <travis@sgi.com>
Link: http://lkml.kernel.org/n/tip-2pXRemsjupmvonbpmmnzleo1@git.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

diff --git a/arch/x86/platform/uv/uv_nmi.c b/arch/x86/platform/uv/uv_nmi.c
index c171ca533156..9126dfb6dbfc 100644
--- a/arch/x86/platform/uv/uv_nmi.c
+++ b/arch/x86/platform/uv/uv_nmi.c
@@ -660,8 +660,7 @@ void uv_nmi_setup(void)
 		}
 		uv_hub_nmi_per(cpu) = uv_hub_nmi_list[nid];
 	}
-	alloc_cpumask_var(&uv_nmi_cpu_mask, GFP_KERNEL);
-	BUG_ON(!uv_nmi_cpu_mask);
+	BUG_ON(!alloc_cpumask_var(&uv_nmi_cpu_mask, GFP_KERNEL));
 }