Commit 46fe24389a44527377077e3ff52206709f0387af

Authored by Linus Torvalds

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

Showing 1 changed file Side-by-side Diff

arch/ia64/sn/kernel/setup.c
... ... @@ -71,7 +71,7 @@
71 71 DEFINE_PER_CPU(struct sn_hub_info_s, __sn_hub_info);
72 72 EXPORT_PER_CPU_SYMBOL(__sn_hub_info);
73 73  
74   -DEFINE_PER_CPU(short [MAX_COMPACT_NODES], __sn_cnodeid_to_nasid);
  74 +DEFINE_PER_CPU(short, __sn_cnodeid_to_nasid[MAX_COMPACT_NODES]);
75 75 EXPORT_PER_CPU_SYMBOL(__sn_cnodeid_to_nasid);
76 76  
77 77 DEFINE_PER_CPU(struct nodepda_s *, __sn_nodepda);