aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Kravetz <kravetz@us.ibm.com>2006-01-06 03:10:51 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 11:33:24 -0500
commita94b3ab7eab4edcc9b2cb474b188f774c331adf7 (patch)
tree96636969fa4a9e0b79c98f81cbcd726c5d3834a5
parentd5afa6dcf74c0efb60ce07c63d0a727be93c67c5 (diff)
[PATCH] mm: remove arch independent NODES_SPAN_OTHER_NODES
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 <kravetz@us.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--include/linux/mmzone.h6
-rw-r--r--mm/page_alloc.c2
2 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index 28f8496abcb9..d294b57a4016 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -603,12 +603,6 @@ void sparse_init(void);
603#define sparse_index_init(_sec, _nid) do {} while (0) 603#define sparse_index_init(_sec, _nid) do {} while (0)
604#endif /* CONFIG_SPARSEMEM */ 604#endif /* CONFIG_SPARSEMEM */
605 605
606#ifdef CONFIG_NODES_SPAN_OTHER_NODES
607#define early_pfn_in_nid(pfn, nid) (early_pfn_to_nid(pfn) == (nid))
608#else
609#define early_pfn_in_nid(pfn, nid) (1)
610#endif
611
612#ifndef early_pfn_valid 606#ifndef early_pfn_valid
613#define early_pfn_valid(pfn) (1) 607#define early_pfn_valid(pfn) (1)
614#endif 608#endif
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 1e49dc7cd619..07825c637a58 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1708,8 +1708,6 @@ void __devinit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
1708 for (pfn = start_pfn; pfn < end_pfn; pfn++, page++) { 1708 for (pfn = start_pfn; pfn < end_pfn; pfn++, page++) {
1709 if (!early_pfn_valid(pfn)) 1709 if (!early_pfn_valid(pfn))
1710 continue; 1710 continue;
1711 if (!early_pfn_in_nid(pfn, nid))
1712 continue;
1713 page = pfn_to_page(pfn); 1711 page = pfn_to_page(pfn);
1714 set_page_links(page, zone, nid, pfn); 1712 set_page_links(page, zone, nid, pfn);
1715 set_page_count(page, 1); 1713 set_page_count(page, 1);