Merge with rsync://fileserver/linux

Update to 2.6.12-rc3

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,
 #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++;
         }
 }