From 7984ab250b02528aeda7a3676b4443e85f34de9b Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 14 Dec 2010 05:47:35 +0000 Subject: [PATCH] Change memguard_fudge() so that it can handle km_max being zero. Not every platform defines VM_KMEM_SIZE_MAX, and on those platforms km_max will be zero. Reviewed by: mdf Tested by: marius --- sys/vm/memguard.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/vm/memguard.c b/sys/vm/memguard.c index 3cf935c27eb..c77f27dedd1 100644 --- a/sys/vm/memguard.c +++ b/sys/vm/memguard.c @@ -184,9 +184,10 @@ memguard_fudge(unsigned long km_size, unsigned long km_max) memguard_mapsize = km_max / vm_memguard_divisor; /* size must be multiple of PAGE_SIZE */ memguard_mapsize = round_page(memguard_mapsize); - if (memguard_mapsize / (2 * PAGE_SIZE) > mem_pgs) + if (memguard_mapsize == 0 || + memguard_mapsize / (2 * PAGE_SIZE) > mem_pgs) memguard_mapsize = mem_pgs * 2 * PAGE_SIZE; - if (km_size + memguard_mapsize > km_max) + if (km_max > 0 && km_size + memguard_mapsize > km_max) return (km_max); return (km_size + memguard_mapsize); }