From e999d92686d8345f4b8c95f4704230a7d07273d9 Mon Sep 17 00:00:00 2001 From: Paolo 'Blaisorblade' Giarrusso Date: Wed, 1 Feb 2006 03:06:26 -0800 Subject: [PATCH] --- yaml --- r: 19431 b: refs/heads/master c: 3dfd95b378953f6cf0bd58fc990c05ef5a0ea1a6 h: refs/heads/master i: 19429: ab1ca91f142a0ddc69c1b4b3e56f18a0052fcb84 19427: 9d1e44738afdc0bb3609fd97367ee216fdb6b9f0 19423: ebcb45e1c0d9258ca5901459c7d8d7e3cec29b26 v: v3 --- [refs] | 2 +- trunk/arch/um/kernel/physmem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f51cf31daf90..69f1d4e92564 100644 --- 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 index f3b583a878a6..544665e04513 100644 --- 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);