Revert f1321f875910172bcc3e1f302fe145a9e4d3bdf7 Causes early panics commit f1321f875910172bcc3e1f302fe145a9e4d3bdf7 Author: travis@sgi.com Date: Fri Jan 18 23:05:33 2008 +0100 x86: Change size of node ids from u8 to u16 fixup Change the size of node ids for X86_64 from 8 bits to 16 bits to accomodate more than 256 nodes. Introduce a "numanode_t" type for x86-generic usage. Signed-off-by: Andi Kleen --- drivers/acpi/numa.c | 2 +- include/asm-x86/mmzone_64.h | 6 +++--- include/linux/numa.h | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) Index: linux/drivers/acpi/numa.c =================================================================== --- linux.orig/drivers/acpi/numa.c +++ linux/drivers/acpi/numa.c @@ -38,7 +38,7 @@ ACPI_MODULE_NAME("numa"); static nodemask_t nodes_found_map = NODE_MASK_NONE; /* maps to convert between proximity domain and logical node ID */ -static numanode_t pxm_to_node_map[MAX_PXM_DOMAINS] +static int pxm_to_node_map[MAX_PXM_DOMAINS] = { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL }; static int node_to_pxm_map[MAX_NUMNODES] = { [0 ... MAX_NUMNODES - 1] = PXM_INVAL }; Index: linux/include/asm-x86/mmzone_64.h =================================================================== --- linux.orig/include/asm-x86/mmzone_64.h +++ linux/include/asm-x86/mmzone_64.h @@ -15,9 +15,9 @@ struct memnode { int shift; unsigned int mapsize; - u16 *map; - u16 embedded_map[64-8]; -} ____cacheline_aligned; /* total size = 128 bytes */ + u8 *map; + u8 embedded_map[64-16]; +} ____cacheline_aligned; /* total size = 64 bytes */ extern struct memnode memnode; #define memnode_shift memnode.shift #define memnodemap memnode.map Index: linux/include/linux/numa.h =================================================================== --- linux.orig/include/linux/numa.h +++ linux/include/linux/numa.h @@ -10,10 +10,4 @@ #define MAX_NUMNODES (1 << NODES_SHIFT) -#if MAX_NUMNODES > 256 -typedef u16 numanode_t; -#else -typedef u8 numanode_t; -#endif - #endif /* _LINUX_NUMA_H */