From cfa2fdff35b484c8321eee7e3f3a522e09116254 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Wed, 27 Sep 2006 01:50:34 -0700
Subject: [PATCH] --- yaml --- r: 36179 b: refs/heads/master c:
 0715501bf1d915002d92e34e8a78ea889e5a0049 h: refs/heads/master i:   36177:
 1d1f474c0d8609b75a976148f5505cb21d4dda30   36175:
 96efe71ff0eefec8b9deac4c2760d1966b25cdef v: v3

---
 [refs]                     | 2 +-
 trunk/arch/um/kernel/mem.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 98aaae09296b..353fb4c1e5ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e7672ec3f059f764fcc5c78216e24bb16c44dba
+refs/heads/master: 0715501bf1d915002d92e34e8a78ea889e5a0049
diff --git a/trunk/arch/um/kernel/mem.c b/trunk/arch/um/kernel/mem.c
index 93121c6d26e5..c95855ba6ab5 100644
--- a/trunk/arch/um/kernel/mem.c
+++ b/trunk/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