[PATCH] uml: get rid of ZONE_DMA use

0715501b · Jeff Dike <[email protected]> · 2006-09-27 01:50:34 -07:00

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 <[email protected]>
Cc: Christoph Lameter <[email protected]>
Cc: Paolo 'Blaisorblade' Giarrusso <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

Commit: 0715501bf1d915002d92e34e8a78ea889e5a0049
Parents: 5e7672ec

Changes

1 files changed · +2 −1

File	Status	Add	Del	Content
arch/um/kernel/mem.c	modified	+2	−1	View file

arch/um/kernel/mem.c

View file

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 93121c6..c95855b 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -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