From: Jeff Dike <jdike@addtoit.com>
Output a nice error message for people who need mem > 256M but don't increase
on the host /proc/sys/vm/max_map_count, telling them to do so.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/arch/um/kernel/physmem.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletion(-)
diff -puN arch/um/kernel/physmem.c~uml-error-message-improvement arch/um/kernel/physmem.c
--- 25/arch/um/kernel/physmem.c~uml-error-message-improvement 2004-09-23 00:08:09.649609000 -0700
+++ 25-akpm/arch/um/kernel/physmem.c 2004-09-23 00:08:09.653608392 -0700
@@ -336,9 +336,14 @@ void map_memory(unsigned long virt, unsi
fd = phys_mapping(phys, &offset);
err = os_map_memory((void *) virt, fd, offset, len, r, w, x);
- if(err)
+ if(err) {
+ if(err == -ENOMEM)
+ printk("try increasing the host's "
+ "/proc/sys/vm/max_map_count to <physical "
+ "memory size>/4096\n");
panic("map_memory(0x%lx, %d, 0x%llx, %ld, %d, %d, %d) failed, "
"err = %d\n", virt, fd, offset, len, r, w, x, err);
+ }
}
#define PFN_UP(x) (((x) + PAGE_SIZE-1) >> PAGE_SHIFT)
_