upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / arch / i386 / mm / discontig.c

diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
index efdcb0d..33b81da 100644 (file)
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
@@ -28,6 +28,7 @@
 #include <linux/mmzone.h>
 #include <linux/highmem.h>
 #include <linux/initrd.h>
+#include <linux/nodemask.h>
 #include <asm/e820.h>
 #include <asm/setup.h>
 #include <asm/mmzone.h>
@@ -467,7 +468,7 @@ void __init set_max_mapnr_init(void)
        if (high0->spanned_pages > 0)
                highmem_start_page = high0->zone_mem_map;
        else
-               highmem_start_page = pfn_to_page(max_low_pfn+1); 
+               highmem_start_page = pfn_to_page(max_low_pfn - 1) + 1;
        num_physpages = highend_pfn;
 #else
        num_physpages = max_low_pfn;