Merge branches 'x86/acpi', 'x86/asm', 'x86/cpudetect', 'x86/crashdump', 'x86/debug...

[linux-2.6-omap-h63xx.git] / arch / x86 / mm / init_32.c

diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 9d36eb9ebd53c24110a7dfb51018a6c6a33dbc6b..06708ee94aa407d1e773afee5b1e1abc102b6635 100644 (file)
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -49,7 +49,6 @@
 #include <asm/paravirt.h>
 #include <asm/setup.h>
 #include <asm/cacheflush.h>
-#include <asm/smp.h>
 
 unsigned int __VMALLOC_RESERVE = 128 << 20;
 
@@ -687,6 +686,9 @@ early_param("highmem", parse_highmem);
  */
 void __init lowmem_pfn_init(void)
 {
+       /* max_low_pfn is 0, we already have early_res support */
+       max_low_pfn = max_pfn;
+
        if (highmem_pages == -1)
                highmem_pages = 0;
 #ifdef CONFIG_HIGHMEM
@@ -720,6 +722,8 @@ void __init lowmem_pfn_init(void)
  */
 void __init highmem_pfn_init(void)
 {
+       max_low_pfn = MAXMEM_PFN;
+
        if (highmem_pages == -1)
                highmem_pages = max_pfn - MAXMEM_PFN;
 
@@ -732,7 +736,6 @@ void __init highmem_pfn_init(void)
                        pages_to_mb(highmem_pages));
                highmem_pages = 0;
        }
-       max_low_pfn = MAXMEM_PFN;
 #ifndef CONFIG_HIGHMEM
        /* Maximum memory usable is what is directly addressable */
        printk(KERN_WARNING "Warning only %ldMB will be used.\n", MAXMEM>>20);
@@ -758,13 +761,10 @@ void __init find_low_pfn_range(void)
 {
        /* it could update max_pfn */
 
-       /* max_low_pfn is 0, we already have early_res support */
-       max_low_pfn = max_pfn;
-
-       if (max_low_pfn > MAXMEM_PFN)
-               highmem_pfn_init();
-       else
+       if (max_pfn <= MAXMEM_PFN)
                lowmem_pfn_init();
+       else
+               highmem_pfn_init();
 }
 
 #ifndef CONFIG_NEED_MULTIPLE_NODES