diff options
| author | kato <kato@FreeBSD.org> | 1999-01-16 11:38:03 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 1999-01-16 11:38:03 +0000 |
| commit | f4bae6e9815023b4ca6a9e3a51a0b392ee818899 (patch) | |
| tree | eb513c1b263a060746fb0a3e2d87553a54016a21 /sys/pc98 | |
| parent | 34c279f4b4d60bca7676de3e41a2c66448582df5 (diff) | |
| download | FreeBSD-src-f4bae6e9815023b4ca6a9e3a51a0b392ee818899.zip FreeBSD-src-f4bae6e9815023b4ca6a9e3a51a0b392ee818899.tar.gz | |
Sync with sys/i386/i386/machdep.c revision up to 1.322.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 9 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 3cee301..9109558 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.103 1998/12/16 16:28:57 bde Exp $ + * $Id: machdep.c,v 1.104 1999/01/08 16:04:20 kato Exp $ */ #include "apm.h" @@ -423,6 +423,12 @@ again: */ { vm_offset_t mb_map_size; + int xclusters; + + /* Allow override of NMBCLUSTERS from the kernel environment */ + if (getenv_int("kern.ipc.nmbclusters", &xclusters) && + xclusters > nmbclusters) + nmbclusters = xclusters; mb_map_size = nmbufs * MSIZE + nmbclusters * MCLBYTES; mb_map_size = roundup2(mb_map_size, max(MCLBYTES, PAGE_SIZE)); @@ -447,6 +453,7 @@ again: #if defined(USERCONFIG) userconfig(); + cninit(); /* the preferred console may have changed */ #endif printf("avail memory = %d (%dK bytes)\n", ptoa(cnt.v_free_count), diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 3cee301..9109558 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.103 1998/12/16 16:28:57 bde Exp $ + * $Id: machdep.c,v 1.104 1999/01/08 16:04:20 kato Exp $ */ #include "apm.h" @@ -423,6 +423,12 @@ again: */ { vm_offset_t mb_map_size; + int xclusters; + + /* Allow override of NMBCLUSTERS from the kernel environment */ + if (getenv_int("kern.ipc.nmbclusters", &xclusters) && + xclusters > nmbclusters) + nmbclusters = xclusters; mb_map_size = nmbufs * MSIZE + nmbclusters * MCLBYTES; mb_map_size = roundup2(mb_map_size, max(MCLBYTES, PAGE_SIZE)); @@ -447,6 +453,7 @@ again: #if defined(USERCONFIG) userconfig(); + cninit(); /* the preferred console may have changed */ #endif printf("avail memory = %d (%dK bytes)\n", ptoa(cnt.v_free_count), |
