diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2010-02-25 08:48:05 +0100 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2010-02-25 08:48:05 +0100 |
commit | 7f03292ee16e68be96aa88904afc6152f8d37736 (patch) | |
tree | 5c32738f0348449c2fa9688d52e6ecf4445d76f0 /arch/ia64/sn/kernel/setup.c | |
parent | c5ecc484c528ff50bdbb16fbfbac758ee368b329 (diff) | |
parent | baac35c4155a8aa826c70acee6553368ca5243a2 (diff) | |
download | linux-7f03292ee16e68be96aa88904afc6152f8d37736.tar.bz2 |
Merge branch 'master' into for-2.6.34
Conflicts:
include/linux/blkdev.h
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'arch/ia64/sn/kernel/setup.c')
-rw-r--r-- | arch/ia64/sn/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c index ece1bf994499..e456f062f241 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); |