[MIPS] paging_init(): use highend_pfn/highstart_pfn

This patch makes paging_init() use highend_pfn/highstart_pfn globals.

It removes the need of 'high' local which was needed only by HIGHMEM config.

More important perhaps, it fixes a bug when HIGHMEM is set but there's
actually no physical highmem (highend_pfn = 0)

Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

authored by

Franck Bui-Huu and committed by
Ralf Baechle
cbb8fc07 b228f4c5

+8 -9
+8 -9
arch/mips/mm/init.c
··· 316 void __init paging_init(void) 317 { 318 unsigned long zones_size[MAX_NR_ZONES] = { 0, }; 319 - unsigned long max_dma, high, low; 320 #ifndef CONFIG_FLATMEM 321 unsigned long zholes_size[MAX_NR_ZONES] = { 0, }; 322 unsigned long i, j, pfn; ··· 331 332 max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; 333 low = max_low_pfn; 334 - high = highend_pfn; 335 336 #ifdef CONFIG_ISA 337 if (low < max_dma) ··· 343 zones_size[ZONE_DMA] = low; 344 #endif 345 #ifdef CONFIG_HIGHMEM 346 - if (cpu_has_dc_aliases) { 347 - printk(KERN_WARNING "This processor doesn't support highmem."); 348 - if (high - low) 349 - printk(" %ldk highmem ignored", high - low); 350 - printk("\n"); 351 - } else 352 - zones_size[ZONE_HIGHMEM] = high - low; 353 #endif 354 355 #ifdef CONFIG_FLATMEM
··· 316 void __init paging_init(void) 317 { 318 unsigned long zones_size[MAX_NR_ZONES] = { 0, }; 319 + unsigned long max_dma, low; 320 #ifndef CONFIG_FLATMEM 321 unsigned long zholes_size[MAX_NR_ZONES] = { 0, }; 322 unsigned long i, j, pfn; ··· 331 332 max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT; 333 low = max_low_pfn; 334 335 #ifdef CONFIG_ISA 336 if (low < max_dma) ··· 344 zones_size[ZONE_DMA] = low; 345 #endif 346 #ifdef CONFIG_HIGHMEM 347 + zones_size[ZONE_HIGHMEM] = highend_pfn - highstart_pfn; 348 + 349 + if (cpu_has_dc_aliases && zones_size[ZONE_HIGHMEM]) { 350 + printk(KERN_WARNING "This processor doesn't support highmem." 351 + " %ldk highmem ignored\n", zones_size[ZONE_HIGHMEM]); 352 + zones_size[ZONE_HIGHMEM] = 0; 353 + } 354 #endif 355 356 #ifdef CONFIG_FLATMEM