summaryrefslogtreecommitdiffstats
path: root/include/asm-ia64/numa.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-29 19:58:22 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-29 19:58:22 -0500
commit79072f38909e3d9883317238887460c39ddcc4cb (patch)
tree28369f5a844535ff836565eefd62695b0e890fa3 /include/asm-ia64/numa.h
parent200d5a7684cc49ef4be40e832daf3f217e70dfbb (diff)
parent55d8ca4f8094246da6e71889a4e04bfafaa78b10 (diff)
downloadlinux-79072f38909e3d9883317238887460c39ddcc4cb.tar.gz
linux-79072f38909e3d9883317238887460c39ddcc4cb.tar.bz2
linux-79072f38909e3d9883317238887460c39ddcc4cb.zip
Merge branch 'upstream'
Diffstat (limited to 'include/asm-ia64/numa.h')
-rw-r--r--include/asm-ia64/numa.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/numa.h b/include/asm-ia64/numa.h
index 3ae128fe0823..dae6aeb7b119 100644
--- a/include/asm-ia64/numa.h
+++ b/include/asm-ia64/numa.h
@@ -23,7 +23,7 @@
#include <asm/mmzone.h>
-extern u8 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
+extern u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
/* Stuff below this line could be architecture independent */