Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753206Ab2FMQZj (ORCPT ); Wed, 13 Jun 2012 12:25:39 -0400 Received: from oproxy9.bluehost.com ([69.89.24.6]:45168 "HELO oproxy9.bluehost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752163Ab2FMQZh (ORCPT ); Wed, 13 Jun 2012 12:25:37 -0400 Message-ID: <4FD8BEF1.6020304@xenotime.net> Date: Wed, 13 Jun 2012 09:25:21 -0700 From: Randy Dunlap User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.15) Gecko/20110323 Thunderbird/3.1.9 MIME-Version: 1.0 To: Stephen Rothwell CC: linux-next@vger.kernel.org, LKML , x86@kernel.org, Andrew Morton Subject: [PATCH -next] x86: fix apic non-ISO code warnings References: <20120613155440.14672516ffaf5b01f91bb0a2@canb.auug.org.au> In-Reply-To: <20120613155440.14672516ffaf5b01f91bb0a2@canb.auug.org.au> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Identified-User: {1807:box742.bluehost.com:xenotime:xenotime.net} {sentby:smtp auth 50.53.38.135 authed with rdunlap@xenotime.net} Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1626 Lines: 46 From: Randy Dunlap Fix x86 apic code warnings: arch/x86/kernel/apic/summit_32.c:297:2: warning: ISO C90 forbids mixed declarations and code arch/x86/kernel/apic/es7000_32.c:558:2: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Randy Dunlap --- arch/x86/kernel/apic/es7000_32.c | 3 ++- arch/x86/kernel/apic/summit_32.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) --- linux-next-20120613.orig/arch/x86/kernel/apic/es7000_32.c +++ linux-next-20120613/arch/x86/kernel/apic/es7000_32.c @@ -554,9 +554,10 @@ es7000_cpu_mask_to_apicid_and(const stru const struct cpumask *andmask, unsigned int *apicid) { - *apicid = early_per_cpu(x86_cpu_to_logical_apicid, 0); cpumask_var_t cpumask; + *apicid = early_per_cpu(x86_cpu_to_logical_apicid, 0); + if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC)) return 0; --- linux-next-20120613.orig/arch/x86/kernel/apic/summit_32.c +++ linux-next-20120613/arch/x86/kernel/apic/summit_32.c @@ -293,9 +293,10 @@ summit_cpu_mask_to_apicid_and(const stru const struct cpumask *andmask, unsigned int *apicid) { - *apicid = early_per_cpu(x86_cpu_to_logical_apicid, 0); cpumask_var_t cpumask; + *apicid = early_per_cpu(x86_cpu_to_logical_apicid, 0); + if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC)) return 0; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/