[PATCH -next] x86: fix apic non-ISO code warnings
From: Randy Dunlap <hidden>
Date: 2012-06-13 16:25:39
Also in:
lkml
From: Randy Dunlap <redacted> 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 <redacted> --- 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;