From 00e4d95bd5183c5011ce63752541ea9f1b59eac8 Mon Sep 17 00:00:00 2001
From: Mike Kravetz <kravetz@us.ibm.com>
Date: Fri, 6 Jan 2006 00:10:51 -0800
Subject: [PATCH] --- yaml --- r: 16310 b: refs/heads/master c:
 a94b3ab7eab4edcc9b2cb474b188f774c331adf7 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/mmzone.h | 6 ------
 trunk/mm/page_alloc.c        | 2 --
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 5bcb6250d8c7..cf999ad16061 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5afa6dcf74c0efb60ce07c63d0a727be93c67c5
+refs/heads/master: a94b3ab7eab4edcc9b2cb474b188f774c331adf7
diff --git a/trunk/include/linux/mmzone.h b/trunk/include/linux/mmzone.h
index 28f8496abcb9..d294b57a4016 100644
--- a/trunk/include/linux/mmzone.h
+++ b/trunk/include/linux/mmzone.h
@@ -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 --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 1e49dc7cd619..07825c637a58 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1708,8 +1708,6 @@ void __devinit memmap_init_zone(unsigned long size, int nid, unsigned long zone,
 	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);