From 7ebb9221f6211194d264799ef477e2527b6f840b Mon Sep 17 00:00:00 2001 From: KATO Takenori Date: Sat, 24 Jan 1998 03:15:37 +0000 Subject: [PATCH] Sync with sys/i386/i386/machdep.c revision 1.282. --- sys/pc98/i386/machdep.c | 18 ++++++++---------- sys/pc98/pc98/machdep.c | 18 ++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index b07690aad90..c864517e5c2 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.68 1998/01/07 09:03:42 kato Exp $ + * $Id: machdep.c,v 1.69 1998/01/12 15:38:51 kato Exp $ */ #include "apm.h" @@ -356,21 +356,19 @@ again: #ifdef BOUNCE_BUFFERS clean_map = kmem_suballoc(kernel_map, &clean_sva, &clean_eva, (nbuf*BKVASIZE) + (nswbuf*MAXPHYS) + - maxbkva + pager_map_size, TRUE); - io_map = kmem_suballoc(clean_map, &minaddr, &maxaddr, maxbkva, FALSE); + maxbkva + pager_map_size); + io_map = kmem_suballoc(clean_map, &minaddr, &maxaddr, maxbkva); #else clean_map = kmem_suballoc(kernel_map, &clean_sva, &clean_eva, - (nbuf*BKVASIZE) + (nswbuf*MAXPHYS) + pager_map_size, TRUE); + (nbuf*BKVASIZE) + (nswbuf*MAXPHYS) + pager_map_size); #endif buffer_map = kmem_suballoc(clean_map, &buffer_sva, &buffer_eva, - (nbuf*BKVASIZE), TRUE); + (nbuf*BKVASIZE)); pager_map = kmem_suballoc(clean_map, &pager_sva, &pager_eva, - (nswbuf*MAXPHYS) + pager_map_size, TRUE); + (nswbuf*MAXPHYS) + pager_map_size); pager_map->system_map = 1; exec_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr, - (16*(ARG_MAX+PAGE_SIZE)), TRUE); - u_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr, - (maxproc*UPAGES*PAGE_SIZE), FALSE); + (16*(ARG_MAX+PAGE_SIZE))); /* * Finally, allocate mbuf pool. Since mclrefcnt is an off-size @@ -384,7 +382,7 @@ again: mclrefcnt = malloc(mb_map_size / MCLBYTES, M_MBUF, M_NOWAIT); bzero(mclrefcnt, mb_map_size / MCLBYTES); mb_map = kmem_suballoc(kmem_map, (vm_offset_t *)&mbutl, &maxaddr, - mb_map_size, FALSE); + mb_map_size); mb_map->system_map = 1; } diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index b07690aad90..c864517e5c2 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91 - * $Id: machdep.c,v 1.68 1998/01/07 09:03:42 kato Exp $ + * $Id: machdep.c,v 1.69 1998/01/12 15:38:51 kato Exp $ */ #include "apm.h" @@ -356,21 +356,19 @@ again: #ifdef BOUNCE_BUFFERS clean_map = kmem_suballoc(kernel_map, &clean_sva, &clean_eva, (nbuf*BKVASIZE) + (nswbuf*MAXPHYS) + - maxbkva + pager_map_size, TRUE); - io_map = kmem_suballoc(clean_map, &minaddr, &maxaddr, maxbkva, FALSE); + maxbkva + pager_map_size); + io_map = kmem_suballoc(clean_map, &minaddr, &maxaddr, maxbkva); #else clean_map = kmem_suballoc(kernel_map, &clean_sva, &clean_eva, - (nbuf*BKVASIZE) + (nswbuf*MAXPHYS) + pager_map_size, TRUE); + (nbuf*BKVASIZE) + (nswbuf*MAXPHYS) + pager_map_size); #endif buffer_map = kmem_suballoc(clean_map, &buffer_sva, &buffer_eva, - (nbuf*BKVASIZE), TRUE); + (nbuf*BKVASIZE)); pager_map = kmem_suballoc(clean_map, &pager_sva, &pager_eva, - (nswbuf*MAXPHYS) + pager_map_size, TRUE); + (nswbuf*MAXPHYS) + pager_map_size); pager_map->system_map = 1; exec_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr, - (16*(ARG_MAX+PAGE_SIZE)), TRUE); - u_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr, - (maxproc*UPAGES*PAGE_SIZE), FALSE); + (16*(ARG_MAX+PAGE_SIZE))); /* * Finally, allocate mbuf pool. Since mclrefcnt is an off-size @@ -384,7 +382,7 @@ again: mclrefcnt = malloc(mb_map_size / MCLBYTES, M_MBUF, M_NOWAIT); bzero(mclrefcnt, mb_map_size / MCLBYTES); mb_map = kmem_suballoc(kmem_map, (vm_offset_t *)&mbutl, &maxaddr, - mb_map_size, FALSE); + mb_map_size); mb_map->system_map = 1; }