summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2006-02-01 03:06:26 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-01 08:53:22 -0800
commit3dfd95b378953f6cf0bd58fc990c05ef5a0ea1a6 (patch)
treeb36f902b9e38b06995d7d9cdf0079019f01f7225 /arch
parent854e981cc69bb93b49bdd052c8bc1dc744509f04 (diff)
downloadlinux-3.10-3dfd95b378953f6cf0bd58fc990c05ef5a0ea1a6.tar.gz
linux-3.10-3dfd95b378953f6cf0bd58fc990c05ef5a0ea1a6.tar.bz2
linux-3.10-3dfd95b378953f6cf0bd58fc990c05ef5a0ea1a6.zip
[PATCH] uml: fix "apples/bananas" typo
Fix stupid typo. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/kernel/physmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index f3b583a878a..544665e0451 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);