There are two #defines to keep track of the maximum number of nodes in the system, and luckily they don't have even remotely similar values!! :( MAX_NR_NODES is about 85, and MAX_NUMNODES is 1, 4, 8, or 16 depending on config options and architectures. Maybe this confuses only me, in which case, please ignore this patch. For those who'd like only one definition of the maximum number of nodes in a system, read on! This patch 1) Gets rid of the include/asm-xxx/numnodes.h files 2) Defines MAX_NR_NODES to the appropriate per-arch value in include/asm-xxx/param.h 3) changes all remaining occurences MAX_NUMNODES to MAX_NR_NODES throughout the kernel I chose to keep MAX_NR_NODES because it (more) closely resembles NR_CPUS, and MAX_NR_MEMBLKS. (Frankly, I'd like to s/NR_CPUS/MAX_NR_CPUS for correctness, but I'd be lynched!! ;) Anyone who is more familiar with some of the architectures I mucked with (arm, alpha, ppc64), please let me know if what I've done looks wrong. Cheers! -Matt