Subject: [PATCH -next] x86: fix apic non-ISO code warnings

From: Randy Dunlap <[email-masked]>
Date: Wed, 13 Jun 2012 09:25:21 -0700

From: Randy Dunlap <[email-masked]>

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 <[email-masked]>
---
 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;