Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] m68k: use proper defines for zone initialization

Browse source 
MAX_NR_ZONES changed, so use correct defines now.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Roman Zippel 2006-06-23 02:04:58 -07:00 committed by Linus Torvalds
parent 882905c7ff
commit 2dcf15b78d
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/m68k/mm/motorola.c
View file

@ -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 ?
(mach_max_dma_address+1) : (unsigned long)high_memory);
zones_size[1] = (unsigned long)high_memory - zones_size[0];
zones_size[ZONE_DMA] = (mach_max_dma_address < (unsigned long)high_memory ?
(mach_max_dma_address+1) : (unsigned long)high_memory);
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);
}

5
arch/m68k/mm/sun3mmu.c
View file

@ -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);