X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=mm%2Fmmzone.c;h=f5b7d1760213e53db3c46e84dde56daf219ea0cd;hb=56de7263fcf3eb10c8dcdf8d59a9cec831795f3f;hp=486ed595ee6fa939f1cef55b7e4349d000d86317;hpb=19770b32609b6bf97a3dece2529089494cbfc549;p=safe%2Fjmp%2Flinux-2.6

diff --git a/mm/mmzone.c b/mm/mmzone.c
index 486ed59..f5b7d17 100644
--- a/mm/mmzone.c
+++ b/mm/mmzone.c
@@ -6,6 +6,7 @@
 
 
 #include <linux/stddef.h>
+#include <linux/mm.h>
 #include <linux/mmzone.h>
 #include <linux/module.h>
 
@@ -69,6 +70,20 @@ struct zoneref *next_zones_zonelist(struct zoneref *z,
 				(z->zone && !zref_in_nodemask(z, nodes)))
 			z++;
 
-	*zone = zonelist_zone(z++);
+	*zone = zonelist_zone(z);
 	return z;
 }
+
+#ifdef CONFIG_ARCH_HAS_HOLES_MEMORYMODEL
+int memmap_valid_within(unsigned long pfn,
+					struct page *page, struct zone *zone)
+{
+	if (page_to_pfn(page) != pfn)
+		return 0;
+
+	if (page_zone(page) != zone)
+		return 0;
+
+	return 1;
+}
+#endif /* CONFIG_ARCH_HAS_HOLES_MEMORYMODEL */