diff options
author | Bob Picco <bob.picco@hp.com> | 2005-06-27 17:36:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-27 18:11:42 -0400 |
commit | 3212c6be251219c0f4c2df0c93e122ff5be0d9dc (patch) | |
tree | 8105201ba37d55beeb4a042d4691661ba400d098 | |
parent | 9c4142a133f7efee08238722b157656c3da7ca97 (diff) |
[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>
-rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
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, | |||
1667 | #ifdef WANT_PAGE_VIRTUAL | 1667 | #ifdef WANT_PAGE_VIRTUAL |
1668 | /* The shift won't overflow because ZONE_NORMAL is below 4G. */ | 1668 | /* The shift won't overflow because ZONE_NORMAL is below 4G. */ |
1669 | if (!is_highmem_idx(zone)) | 1669 | if (!is_highmem_idx(zone)) |
1670 | set_page_address(page, __va(start_pfn << PAGE_SHIFT)); | 1670 | set_page_address(page, __va(pfn << PAGE_SHIFT)); |
1671 | #endif | 1671 | #endif |
1672 | start_pfn++; | ||
1673 | } | 1672 | } |
1674 | } | 1673 | } |
1675 | 1674 | ||