Merge tag 'mips_6.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux

[sfrench/cifs-2.6.git] / arch / mips / kernel / setup.c

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 328426c3ed6f9f74f2217a1c7811ae9fde94f0f9..9c30de1515976159e0210724a6e19313832a0fad 100644 (file)
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -147,7 +147,7 @@ static unsigned long __init init_initrd(void)
        /*
         * Board specific code or command line parser should have
         * already set up initrd_start and initrd_end. In these cases
-        * perfom sanity checks and use them if all looks good.
+        * perform sanity checks and use them if all looks good.
         */
        if (!initrd_start || initrd_end <= initrd_start)
                goto disable;
@@ -322,11 +322,11 @@ static void __init bootmem_init(void)
                panic("Incorrect memory mapping !!!");
 
        if (max_pfn > PFN_DOWN(HIGHMEM_START)) {
+               max_low_pfn = PFN_DOWN(HIGHMEM_START);
 #ifdef CONFIG_HIGHMEM
-               highstart_pfn = PFN_DOWN(HIGHMEM_START);
+               highstart_pfn = max_low_pfn;
                highend_pfn = max_pfn;
 #else
-               max_low_pfn = PFN_DOWN(HIGHMEM_START);
                max_pfn = max_low_pfn;
 #endif
        }