linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Jes Sorensen <jes@sgi.com>,
	linux-ia64@vger.kernel.org, Tejun Heo <tj@kernel.org>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	akpm <akpm@linux-foundation.org>
Subject: [PATCH -next] ia64/sn: fix percpu warnings
Date: Wed, 14 Oct 2009 15:10:03 -0700	[thread overview]
Message-ID: <20091014151003.0ef42973.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20091014163445.f0441473.sfr@canb.auug.org.au>

From: Randy Dunlap <randy.dunlap@oracle.com>

Fix percpu types warning in ia64/sn:

arch/ia64/sn/kernel/setup.c:74: error: conflicting types for '__pcpu_scope___sn_cnodeid_to_nasid'
arch/ia64/include/asm/sn/arch.h:74: error: previous declaration of '__pcpu_scope___sn_cnodeid_to_nasid' was here

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Jes Sorensen <jes@sgi.com>
---
 arch/ia64/include/asm/sn/arch.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-next-20091014.orig/arch/ia64/include/asm/sn/arch.h
+++ linux-next-20091014/arch/ia64/include/asm/sn/arch.h
@@ -71,7 +71,7 @@ DECLARE_PER_CPU(struct sn_hub_info_s, __
  * Compact node ID to nasid mappings kept in the per-cpu data areas of each
  * cpu.
  */
-DECLARE_PER_CPU(short, __sn_cnodeid_to_nasid[MAX_COMPACT_NODES]);
+DECLARE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeid_to_nasid);
 #define sn_cnodeid_to_nasid	(&__get_cpu_var(__sn_cnodeid_to_nasid[0]))
 
 

  parent reply	other threads:[~2009-10-14 22:13 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-14  5:34 linux-next: Tree for October 14 Stephen Rothwell
2009-10-14 15:55 ` Randy Dunlap
2009-10-14 21:12   ` Stephen Rothwell
2009-10-14 22:10 ` Randy Dunlap [this message]
2009-10-15  1:33   ` [PATCH -next] ia64/sn: fix percpu warnings Tejun Heo
2009-10-26 18:24     ` Tony Luck
2009-10-26 23:35       ` Luck, Tony
2009-10-28 15:03         ` Tejun Heo
2009-10-28 16:24           ` Luck, Tony
2009-10-28 16:37             ` Tejun Heo
2009-10-28 16:58               ` Luck, Tony
2009-10-28 22:23                 ` Luck, Tony
2009-10-29 14:43                   ` Tejun Heo
2009-10-29 15:43                     ` Tejun Heo
2009-10-30 16:05                       ` Jan Beulich
2009-10-14 22:10 ` [PATCH -next] kvm: fix ia64 printk formats Randy Dunlap
2009-10-15  2:32   ` Zhang, Xiantao
2009-10-15  1:17 ` [PATCH -next] vmxnet: fix 2 build problems Randy Dunlap
2009-10-15  2:00   ` [Pv-drivers] " Bhavesh Davda
2009-10-15  3:39     ` David Miller

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=20091014151003.0ef42973.randy.dunlap@oracle.com \
    --to=randy.dunlap@oracle.com \
    --cc=akpm@linux-foundation.org \
    --cc=jes@sgi.com \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=tj@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).