aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-24 10:51:04 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-24 10:51:04 -0800
commit46fe24389a44527377077e3ff52206709f0387af (patch)
tree7a2c0bb9e3df80f2bf3a3c20616de282ba6127bb
parent7b1f94b8a600a3e8b1f8015c5045f1cc8d100a54 (diff)
parentf7624c97b8e5bca49be7854309550bff8ce98c47 (diff)
downloadmrst-s0i3-test-46fe24389a44527377077e3ff52206709f0387af.tar.gz
mrst-s0i3-test-46fe24389a44527377077e3ff52206709f0387af.tar.xz
mrst-s0i3-test-46fe24389a44527377077e3ff52206709f0387af.zip
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
-rw-r--r--arch/ia64/sn/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index ece1bf99449..e456f062f24 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -71,7 +71,7 @@ EXPORT_SYMBOL(sn_rtc_cycles_per_second);
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);