From: Bob Picco <bob.picco@hp.com>
Date: Mon, 27 Jun 2005 21:36:28 +0000 (-0700)
Subject: [PATCH] fix WANT_PAGE_VIRTUAL in memmap_init
X-Git-Tag: firefly_0821_release~42870^2~130
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3212c6be251219c0f4c2df0c93e122ff5be0d9dc;p=firefly-linux-kernel-4.4.55.git

[PATCH] fix WANT_PAGE_VIRTUAL in memmap_init

I spotted this issue while in memmap_init last week.  I can't say the
change has any test coverage by me.  start_pfn was formerly used in main
"for" loop.  The fix is replace start_pfn with pfn.

Signed-off-by: Bob Picco <bob.picco@hp.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 7ee675ad101e..3c9f7f881125 100644
--- a/mm/page_alloc.c
+++ b/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++;
 	}
 }