diff --git a/[refs] b/[refs]
index e562d1cc923f..9d1b26ea45ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c4142a133f7efee08238722b157656c3da7ca97
+refs/heads/master: 3212c6be251219c0f4c2df0c93e122ff5be0d9dc
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 7ee675ad101e..3c9f7f881125 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1667,9 +1667,8 @@ void __init memmap_init_zone(unsigned long size, int nid, unsigned long zone,
 #ifdef WANT_PAGE_VIRTUAL
 		/* The shift won't overflow because ZONE_NORMAL is below 4G. */
 		if (!is_highmem_idx(zone))
-			set_page_address(page, __va(start_pfn << PAGE_SHIFT));
+			set_page_address(page, __va(pfn << PAGE_SHIFT));
 #endif
-		start_pfn++;
 	}
 }