Merge branch 'master' of /home/src/linux-2.6/

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index f3b583a878a6..544665e04513 100644
--- a/arch/um/kernel/physmem.c
+++ b/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);