Commit 2dcf15b7 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

[PATCH] m68k: use proper defines for zone initialization 



MAX_NR_ZONES changed, so use correct defines now.

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 882905c7

arch/m68k/mm/motorola.c

+6 −6
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ void __init paging_init(void) 
{

	int chunk;

	unsigned long mem_avail = 0;

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

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



#ifdef DEBUG

	{
@@ -257,12 +257,12 @@ void __init paging_init(void) 
#ifdef DEBUG

	printk ("before free_area_init\n");

#endif

	zones_size[0] = (mach_max_dma_address < (unsigned long)high_memory ?

	zones_size[ZONE_DMA] = (mach_max_dma_address < (unsigned long)high_memory ?

				(mach_max_dma_address+1) : (unsigned long)high_memory);

	zones_size[1] = (unsigned long)high_memory - zones_size[0];

	zones_size[ZONE_NORMAL] = (unsigned long)high_memory - zones_size[0];



	zones_size[0] = (zones_size[0] - PAGE_OFFSET) >> PAGE_SHIFT;

	zones_size[1] >>= PAGE_SHIFT;

	zones_size[ZONE_DMA] = (zones_size[ZONE_DMA] - PAGE_OFFSET) >> PAGE_SHIFT;

	zones_size[ZONE_NORMAL] >>= PAGE_SHIFT;



	free_area_init(zones_size);

}

arch/m68k/mm/sun3mmu.c

+2 −3
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void __init paging_init(void) 
	unsigned long address;

	unsigned long next_pgtable;

	unsigned long bootmem_end;

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

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

	unsigned long size;
@@ -92,8 +92,7 @@ void __init paging_init(void) 
	current->mm = NULL;



	/* memory sizing is a hack stolen from motorola.c..  hope it works for us */

	zones_size[0] = ((unsigned long)high_memory - PAGE_OFFSET) >> PAGE_SHIFT;

	zones_size[1] = 0;

	zones_size[ZONE_DMA] = ((unsigned long)high_memory - PAGE_OFFSET) >> PAGE_SHIFT;



	free_area_init(zones_size);