Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46fe2438 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7b1f94b8 f7624c97

arch/ia64/sn/kernel/setup.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ EXPORT_SYMBOL(sn_rtc_cycles_per_second); 
DEFINE_PER_CPU(struct sn_hub_info_s, __sn_hub_info);

DEFINE_PER_CPU(struct sn_hub_info_s, __sn_hub_info);

EXPORT_PER_CPU_SYMBOL(__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);

EXPORT_PER_CPU_SYMBOL(__sn_cnodeid_to_nasid);





DEFINE_PER_CPU(struct nodepda_s *, __sn_nodepda);

DEFINE_PER_CPU(struct nodepda_s *, __sn_nodepda);