From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Date: Wed, 14 Oct 2009 22:10:03 +0000 Subject: [PATCH -next] ia64/sn: fix percpu warnings Message-Id: <20091014151003.0ef42973.randy.dunlap@oracle.com> List-Id: References: <20091014163445.f0441473.sfr@canb.auug.org.au> In-Reply-To: <20091014163445.f0441473.sfr@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Stephen Rothwell , Jes Sorensen , linux-ia64@vger.kernel.org, Tejun Heo Cc: linux-next@vger.kernel.org, LKML , akpm From: Randy Dunlap 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 Cc: Jes Sorensen --- 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]))