From: Mike Kravetz The NODES_SPAN_OTHER_NODES config option was created so that DISCONTIGMEM could handle pSeries numa layouts. However, support for DISCONTIGMEM has been replaced by SPARSEMEM on powerpc. As a result, this config option and supporting code is no longer needed. I have already sent a patch to Paul that removes the option from powerpc specific code. This removes the arch independent piece. Doesn't really matter which is applied first. Signed-off-by: Mike Kravetz Signed-off-by: Andrew Morton --- include/linux/mmzone.h | 6 ------ mm/page_alloc.c | 2 -- 2 files changed, 8 deletions(-) diff -puN include/linux/mmzone.h~mm-remove-arch-independent-nodes_span_other_nodes include/linux/mmzone.h --- devel/include/linux/mmzone.h~mm-remove-arch-independent-nodes_span_other_nodes 2005-12-10 21:49:55.000000000 -0800 +++ devel-akpm/include/linux/mmzone.h 2005-12-10 21:49:55.000000000 -0800 @@ -603,12 +603,6 @@ void sparse_init(void); #define sparse_index_init(_sec, _nid) do {} while (0) #endif /* CONFIG_SPARSEMEM */ -#ifdef CONFIG_NODES_SPAN_OTHER_NODES -#define early_pfn_in_nid(pfn, nid) (early_pfn_to_nid(pfn) == (nid)) -#else -#define early_pfn_in_nid(pfn, nid) (1) -#endif - #ifndef early_pfn_valid #define early_pfn_valid(pfn) (1) #endif diff -puN mm/page_alloc.c~mm-remove-arch-independent-nodes_span_other_nodes mm/page_alloc.c --- devel/mm/page_alloc.c~mm-remove-arch-independent-nodes_span_other_nodes 2005-12-10 21:49:55.000000000 -0800 +++ devel-akpm/mm/page_alloc.c 2005-12-10 21:49:55.000000000 -0800 @@ -1709,8 +1709,6 @@ void __devinit memmap_init_zone(unsigned for (pfn = start_pfn; pfn < end_pfn; pfn++, page++) { if (!early_pfn_valid(pfn)) continue; - if (!early_pfn_in_nid(pfn, nid)) - continue; page = pfn_to_page(pfn); set_page_links(page, zone, nid, pfn); set_page_count(page, 1); _