Rearrange user page table size calculation so that silent overflow

cannot occur

diff --git a/sys/arch/amiga/amiga/pmap.c b/sys/arch/amiga/amiga/pmap.c
index 145fc82..6f0249d 100644 (file)
--- a/sys/arch/amiga/amiga/pmap.c
+++ b/sys/arch/amiga/amiga/pmap.c
@@ -558,7 +558,8 @@ pmap_init(phys_start, phys_end)
         * map where we want it.
         */
        addr = AMIGA_UPTBASE;
-       s = min(AMIGA_UPTMAXSIZE, maxproc * AMIGA_UPTSIZE);
+       s = AMIGA_UPTMAXSIZE / AMIGA_UPTSIZE < maxproc ?
+           AMIGA_UPTMAXSIZE : maxproc * AMIGA_UPTSIZE;
        addr2 = addr + s;
        rv = vm_map_find(kernel_map, NULL, 0, &addr, s, TRUE);
        if (rv != KERN_SUCCESS)