mips: Optimize max_mapnr init procedure

max_mapnr defines the upper boundary of the pages space in the system.
Currently in case if HIGHMEM is available it's calculated based on the
upper high memory PFN limit value. Seeing there is a case when it isn't
fully correct let's optimize out the max_mapnr variable initialization
procedure to cover all the handled in the paging_init() method cases:
1. If CPU has DC-aliases, then high memory is unavailable so the PFNs
upper boundary is determined by max_low_pfn.
2. Otherwise if high memory is available, use highend_pfn value
representing the upper high memory PFNs limit.
3. Otherwise no high memory is available so set max_mapnr with the
low-memory upper limit.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 6e368a4658b544cfd87a35c17775f94c6287ac1c..b2dce07116e8a78516be266dded81e4490e0b4f8 100644 (file)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -421,9 +421,13 @@ void __init paging_init(void)
                       " %ldk highmem ignored\n",
                       (highend_pfn - max_low_pfn) << (PAGE_SHIFT - 10));
                max_zone_pfns[ZONE_HIGHMEM] = max_low_pfn;
-       }
 
-       max_mapnr = highend_pfn ? highend_pfn : max_low_pfn;
+               max_mapnr = max_low_pfn;
+       } else if (highend_pfn) {
+               max_mapnr = highend_pfn;
+       } else {
+               max_mapnr = max_low_pfn;
+       }
 #else
        max_mapnr = max_low_pfn;
 #endif