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. Cc: Eric Dumazet Signed-off-by: Mike Travis Reviewed-by: Christoph Lameter --- Fixup: Size of memnode.embedded_map needs to be changed to accomodate 16-bit node ids as suggested by Eric. V2->V3: - changed memnode.embedded_map from [64-16] to [64-8] (and size comment to 128 bytes) V1->V2: - changed pxm_to_node_map to u16 - changed memnode map entries to u16 --- arch/x86/mm/numa_64.c | 2 +- drivers/acpi/numa.c | 2 +- include/asm-x86/mmzone_64.h | 6 +++--- include/linux/numa.h | 6 ++++++ 4 files changed, 11 insertions(+), 5 deletions(-) --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -88,7 +88,7 @@ static int __init allocate_cachealigned_ unsigned long pad, pad_addr; memnodemap = memnode.embedded_map; - if (memnodemapsize <= 48) + if (memnodemapsize <= ARRAY_SIZE(memnode.embedded_map)) return 0; pad = L1_CACHE_BYTES - 1; --- a/drivers/acpi/numa.c +++ b/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 int pxm_to_node_map[MAX_PXM_DOMAINS] +static numanode_t 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 }; --- a/include/asm-x86/mmzone_64.h +++ b/include/asm-x86/mmzone_64.h @@ -15,9 +15,9 @@ struct memnode { int shift; unsigned int mapsize; - u8 *map; - u8 embedded_map[64-16]; -} ____cacheline_aligned; /* total size = 64 bytes */ + u16 *map; + u16 embedded_map[64-8]; +} ____cacheline_aligned; /* total size = 128 bytes */ extern struct memnode memnode; #define memnode_shift memnode.shift #define memnodemap memnode.map --- a/include/linux/numa.h +++ b/include/linux/numa.h @@ -10,4 +10,10 @@ #define MAX_NUMNODES (1 << NODES_SHIFT) +#if MAX_NUMNODES > 256 +typedef u16 numanode_t; +#else +typedef u8 numanode_t; +#endif + #endif /* _LINUX_NUMA_H */ -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/