---

yaml --- r: 19431 b: refs/heads/master c: 3dfd95b h: refs/heads/master i: 19429: ab1ca91 19427: 9d1e447 19423: ebcb45e v: v3
git-mirror · Feb 1, 2006 · e999d92 · e999d92
1 parent b2211b1
commit e999d92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 854e981cc69bb93b49bdd052c8bc1dc744509f04
+refs/heads/master: 3dfd95b378953f6cf0bd58fc990c05ef5a0ea1a6
diff --git a/trunk/arch/um/kernel/physmem.c b/trunk/arch/um/kernel/physmem.c
@@ -265,7 +265,7 @@ int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
 	highmem_len = highmem_pages * sizeof(struct page);
 
 	total_pages = phys_pages + iomem_pages + highmem_pages;
-	total_len = phys_len + iomem_pages + highmem_len;
+	total_len = phys_len + iomem_len + highmem_len;
 
 	if(kmalloc_ok){
 		map = kmalloc(total_len, GFP_KERNEL);