From e9a70c6cd05b3d01ea67fdc58c324342699a8edb Mon Sep 17 00:00:00 2001 From: kato Date: Fri, 6 Dec 1996 19:51:49 +0000 Subject: [PATCH] Synchronize with sys/i386/i386/machdep.c revision 1.217. This should not be in 2.2 until original change is merged. --- sys/pc98/i386/machdep.c | 10 +++++----- sys/pc98/pc98/machdep.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index a2cc1e253b75..e8105c56895d 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.15 1996/12/04 04:20:27 asami Exp $ + * $Id: machdep.c,v 1.16 1996/12/04 04:36:57 asami Exp $ */ #include "npx.h" @@ -289,7 +289,7 @@ again: if (nbuf == 0) { nbuf = 30; if( physmem > 1024) - nbuf += min((physmem - 1024) / 6, 2048); + nbuf += min((physmem - 1024) / 4, 1536); } nswbuf = max(min(nbuf/4, 128), 16); @@ -329,15 +329,15 @@ again: #ifdef BOUNCE_BUFFERS clean_map = kmem_suballoc(kernel_map, &clean_sva, &clean_eva, - (3*nbuf*DFLTBSIZE/2) + (nswbuf*MAXPHYS) + + (nbuf*BKVASIZE) + (nswbuf*MAXPHYS) + maxbkva + pager_map_size, TRUE); io_map = kmem_suballoc(clean_map, &minaddr, &maxaddr, maxbkva, FALSE); #else clean_map = kmem_suballoc(kernel_map, &clean_sva, &clean_eva, - (nbuf*MAXBSIZE) + (nswbuf*MAXPHYS) + pager_map_size, TRUE); + (nbuf*BKVASIZE) + (nswbuf*MAXPHYS) + pager_map_size, TRUE); #endif buffer_map = kmem_suballoc(clean_map, &buffer_sva, &buffer_eva, - (3*nbuf*DFLTBSIZE/2), TRUE); + (nbuf*BKVASIZE), TRUE); pager_map = kmem_suballoc(clean_map, &pager_sva, &pager_eva, (nswbuf*MAXPHYS) + pager_map_size, TRUE); exec_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr, diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index a2cc1e253b75..e8105c56895d 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.15 1996/12/04 04:20:27 asami Exp $ + * $Id: machdep.c,v 1.16 1996/12/04 04:36:57 asami Exp $ */ #include "npx.h" @@ -289,7 +289,7 @@ again: if (nbuf == 0) { nbuf = 30; if( physmem > 1024) - nbuf += min((physmem - 1024) / 6, 2048); + nbuf += min((physmem - 1024) / 4, 1536); } nswbuf = max(min(nbuf/4, 128), 16); @@ -329,15 +329,15 @@ again: #ifdef BOUNCE_BUFFERS clean_map = kmem_suballoc(kernel_map, &clean_sva, &clean_eva, - (3*nbuf*DFLTBSIZE/2) + (nswbuf*MAXPHYS) + + (nbuf*BKVASIZE) + (nswbuf*MAXPHYS) + maxbkva + pager_map_size, TRUE); io_map = kmem_suballoc(clean_map, &minaddr, &maxaddr, maxbkva, FALSE); #else clean_map = kmem_suballoc(kernel_map, &clean_sva, &clean_eva, - (nbuf*MAXBSIZE) + (nswbuf*MAXPHYS) + pager_map_size, TRUE); + (nbuf*BKVASIZE) + (nswbuf*MAXPHYS) + pager_map_size, TRUE); #endif buffer_map = kmem_suballoc(clean_map, &buffer_sva, &buffer_eva, - (3*nbuf*DFLTBSIZE/2), TRUE); + (nbuf*BKVASIZE), TRUE); pager_map = kmem_suballoc(clean_map, &pager_sva, &pager_eva, (nswbuf*MAXPHYS) + pager_map_size, TRUE); exec_map = kmem_suballoc(kernel_map, &minaddr, &maxaddr,