Commit 0715501b authored Sep 27, 2006 by Jeff Dike Committed by Linus Torvalds Sep 27, 2006

[PATCH] uml: get rid of ZONE_DMA use



ZONE_DMA might become dependent on CONFIG_ZONE_DMA, which UML doesn't define
(we're still arguing about this) So, let's change ZONE_DMA to ZONE_NORMAL.

This is prompted by optional-zone_dma-in-the-vm.patch, but should be harmless
on its own.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Christoph Lameter <clameter@engr.sgi.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 5e7672ec

arch/um/kernel/mem.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,8 @@ void paging_init(void)
		for(i = 0; i < ARRAY_SIZE(zones_size); i++)
		zones_size[i] = 0;

		zones_size[ZONE_DMA] = (end_iomem >> PAGE_SHIFT) - (uml_physmem >> PAGE_SHIFT);
		zones_size[ZONE_NORMAL] = (end_iomem >> PAGE_SHIFT) -
		(uml_physmem >> PAGE_SHIFT);
		#ifdef CONFIG_HIGHMEM
		zones_size[ZONE_HIGHMEM] = highmem >> PAGE_SHIFT;
		#endif

Admin message