[IA64] fix percpu warnings
authorRandy Dunlap <randy.dunlap@oracle.com>
Wed, 14 Oct 2009 22:10:03 +0000 (15:10 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 15 Oct 2009 20:29:37 +0000 (13:29 -0700)
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>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/include/asm/sn/arch.h

index 7caa1f44cd95d923b21116c7e727c3e787790058..f5f493b0c07783a350a23636ea274c52586f41df 100644 (file)
@@ -71,7 +71,7 @@ DECLARE_PER_CPU(struct sn_hub_info_s, __sn_hub_info);
  * 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]))