aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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);