commit 46fe24389a44527377077e3ff52206709f0387af
author Linus Torvalds <torvalds@linux-foundation.org> Wed Feb 24 10:51:04 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Wed Feb 24 10:51:04 2010 -0800
tree 7a2c0bb9e3df80f2bf3a3c20616de282ba6127bb
parent 7b1f94b8a600a3e8b1f8015c5045f1cc8d100a54
parent f7624c97b8e5bca49be7854309550bff8ce98c47

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] Fix broken sn2 build

arch/ia64/sn/kernel/setup.c

diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index ece1bf9..e456f06 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -71,7 +71,7 @@
 DEFINE_PER_CPU(struct sn_hub_info_s, __sn_hub_info);
 EXPORT_PER_CPU_SYMBOL(__sn_hub_info);
 
-DEFINE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeid_to_nasid);
+DEFINE_PER_CPU(short, __sn_cnodeid_to_nasid[MAX_COMPACT_NODES]);
 EXPORT_PER_CPU_SYMBOL(__sn_cnodeid_to_nasid);
 
 DEFINE_PER_CPU(struct nodepda_s *, __sn_nodepda);