---

yaml --- r: 36179 b: refs/heads/master c: 0715501 h: refs/heads/master i: 36177: 1d1f474 36175: 96efe71 v: v3
git-mirror · Sep 27, 2006 · cfa2fdf · cfa2fdf
1 parent 846ab86
commit cfa2fdf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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