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

Commit 353f8d1c authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: fix hardcoded ZONE_* constants in zone setup 



Remove usage of hardcoded constants in paging_init().

By chance I spotted a bug in zones_setup involving a change to ZONE_*
constants, due to the ZONE_DMA32 patch from Andi Kleen (which is in -mm).
So, possibly, instead of zones_size[2] you will find zones_size[3] in the
code, but that change is wrong and this patch is still correct.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 77cc0db4

arch/um/kernel/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ void paging_init(void) 
	empty_bad_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);

	for(i=0;i<sizeof(zones_size)/sizeof(zones_size[0]);i++) 

		zones_size[i] = 0;

	zones_size[0] = (end_iomem >> PAGE_SHIFT) - (uml_physmem >> PAGE_SHIFT);

	zones_size[2] = highmem >> PAGE_SHIFT;

	zones_size[ZONE_DMA] = (end_iomem >> PAGE_SHIFT) - (uml_physmem >> PAGE_SHIFT);

	zones_size[ZONE_HIGHMEM] = highmem >> PAGE_SHIFT;

	free_area_init(zones_size);



	/*