From: Randy Dunlap <rdunlap@xenotime•net>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>,
x86@kernel•org, Andrew Morton <akpm@linux-foundation•org>
Subject: [PATCH -next] x86: fix apic non-ISO code warnings
Date: Wed, 13 Jun 2012 09:25:21 -0700 [thread overview]
Message-ID: <4FD8BEF1.6020304@xenotime.net> (raw)
In-Reply-To: <20120613155440.14672516ffaf5b01f91bb0a2@canb.auug.org.au>
From: Randy Dunlap <rdunlap@xenotime•net>
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 <rdunlap@xenotime•net>
---
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;
prev parent reply other threads:[~2012-06-13 16:25 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-13 5:54 linux-next: Tree for Jun 13 Stephen Rothwell
2012-06-13 16:11 ` linux-next: Tree for Jun 13 (crypto) Randy Dunlap
2012-06-13 17:03 ` Jussi Kivilinna
2012-06-13 19:05 ` Johannes Goetzfried
2012-06-13 19:14 ` Jussi Kivilinna
2012-06-14 2:16 ` Herbert Xu
2012-06-13 16:25 ` Randy Dunlap [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4FD8BEF1.6020304@xenotime.net \
--to=rdunlap@xenotime$(echo .)net \
--cc=akpm@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=x86@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox