Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cbb8fc07 authored by Franck Bui-Huu's avatar Franck Bui-Huu Committed by Ralf Baechle
Browse files

[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: default avatarFranck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b228f4c5

arch/mips/mm/init.c

+8 −9
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int __init page_is_ram(unsigned long pagenr) 
void __init paging_init(void)

{

	unsigned long zones_size[MAX_NR_ZONES] = { 0, };

	unsigned long max_dma, high, low;

	unsigned long max_dma, low;

#ifndef CONFIG_FLATMEM

	unsigned long zholes_size[MAX_NR_ZONES] = { 0, };

	unsigned long i, j, pfn;
@@ -331,7 +331,6 @@ void __init paging_init(void) 


	max_dma = virt_to_phys((char *)MAX_DMA_ADDRESS) >> PAGE_SHIFT;

	low = max_low_pfn;

	high = highend_pfn;



#ifdef CONFIG_ISA

	if (low < max_dma)
@@ -344,13 +343,13 @@ void __init paging_init(void) 
	zones_size[ZONE_DMA] = low;

#endif

#ifdef CONFIG_HIGHMEM

	if (cpu_has_dc_aliases) {

		printk(KERN_WARNING "This processor doesn't support highmem.");

		if (high - low)

			printk(" %ldk highmem ignored", high - low);

		printk("\n");

	} else

		zones_size[ZONE_HIGHMEM] = high - low;

	zones_size[ZONE_HIGHMEM] = highend_pfn - highstart_pfn;



	if (cpu_has_dc_aliases && zones_size[ZONE_HIGHMEM]) {

		printk(KERN_WARNING "This processor doesn't support highmem."

		       " %ldk highmem ignored\n", zones_size[ZONE_HIGHMEM]);

		zones_size[ZONE_HIGHMEM] = 0;

	}

#endif



#ifdef CONFIG_FLATMEM