diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2005-09-25 20:05:38 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2005-09-25 20:05:38 +0000 |
| commit | 88f1e77e0734d696a68dcc5cf56590f8b82d527c (patch) | |
| tree | e0e45f3f1b395d2ca862b01b534cd7a10539132d /sys | |
| parent | 0b4beffd4c26ac02605a816373239e2645d8e14d (diff) | |
Do not try increasing NKMEMPAGE_MAX on sun4m at all, until we make
kernel_map larger.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sparc/include/param.h | 3 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/autoconf.c | 13 |
2 files changed, 2 insertions, 14 deletions
diff --git a/sys/arch/sparc/include/param.h b/sys/arch/sparc/include/param.h index 837cfbdc70e..6b36eda3d6b 100644 --- a/sys/arch/sparc/include/param.h +++ b/sys/arch/sparc/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.32 2005/09/21 20:58:24 miod Exp $ */ +/* $OpenBSD: param.h,v 1.33 2005/09/25 20:05:35 miod Exp $ */ /* $NetBSD: param.h,v 1.29 1997/03/10 22:50:37 pk Exp $ */ /* @@ -111,7 +111,6 @@ */ #define NKMEMPAGES_MIN_DEFAULT ((4 * 1024 * 1024) >> PAGE_SHIFT) #define NKMEMPAGES_MAX_DEFAULT ((8 * 1024 * 1024) >> PAGE_SHIFT) -#define NKMEMPAGES_MAX_DEFAULT_SUN4M ((24 * 1024 * 1024) >> PAGE_SHIFT) /* pages ("clicks") to disk blocks */ #define ctod(x) ((x) << (PGSHIFT - DEV_BSHIFT)) diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 351c267fbb6..3baf15d283d 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.68 2005/09/12 23:05:05 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.69 2005/09/25 20:05:37 miod Exp $ */ /* $NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */ /* @@ -221,17 +221,6 @@ bootstrap() ddb_init(); #endif -#if defined(SUN4M) - /* - * Allow a larger kernel malloc space on sun4m. - */ - if (CPU_ISSUN4M) { - extern u_int nkmempages_max; - - nkmempages_max = NKMEMPAGES_MAX_DEFAULT_SUN4M; - } -#endif - /* * On sun4ms we have to do some nasty stuff here. We need to map * in the interrupt registers (since we need to find out where |