From dc6a98e92c3561ec9743290f980771882a8bf17c Mon Sep 17 00:00:00 2001 From: mrg Date: Thu, 12 Jun 1997 15:09:23 +0000 Subject: [PATCH] bring mrg-vm-swap2 onto mainilne. --- sys/arch/alpha/include/vmparam.h | 12 +----------- sys/arch/amiga/include/vmparam.h | 12 +----------- sys/arch/arm32/include/vmparam.h | 11 +---------- sys/arch/atari/include/vmparam.h | 12 +----------- sys/arch/hp300/include/vmparam.h | 12 +----------- sys/arch/i386/include/vmparam.h | 11 +---------- sys/arch/mac68k/include/vmparam.h | 12 +----------- sys/arch/mips/include/vmparam.h | 12 +----------- sys/arch/mvme68k/include/vmparam.h | 12 +----------- sys/arch/ofppc/include/vmparam.h | 8 +------- sys/arch/pc532/include/vmparam.h | 11 +---------- sys/arch/powerpc/include/vmparam.h | 8 +------- sys/arch/sparc/include/vmparam.h | 13 +------------ sys/arch/sun3/include/vmparam.h | 12 +----------- sys/arch/sun3/include/vmparam3.h | 12 +----------- sys/arch/sun3/include/vmparam3x.h | 12 +----------- sys/arch/sun3x/include/vmparam.h | 12 +----------- sys/arch/vax/include/vmparam.h | 12 +----------- sys/arch/x68k/include/vmparam.h | 12 +----------- 19 files changed, 19 insertions(+), 199 deletions(-) diff --git a/sys/arch/alpha/include/vmparam.h b/sys/arch/alpha/include/vmparam.h index a0fd9bee3a60..4c3cb701deb1 100644 --- a/sys/arch/alpha/include/vmparam.h +++ b/sys/arch/alpha/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.4 1997/04/06 08:47:47 cgd Exp $ */ +/* $NetBSD: vmparam.h,v 1.5 1997/06/12 15:09:23 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -73,16 +73,6 @@ #define MAXSSIZ (1<<25) /* max stack size (32M) */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ - /* * PTEs for mapping user space into the kernel for phyio operations. * 64 pte's are enough to cover 8 disks * MAXBSIZE. diff --git a/sys/arch/amiga/include/vmparam.h b/sys/arch/amiga/include/vmparam.h index 1a97a69fbac2..a46ca30d0dce 100644 --- a/sys/arch/amiga/include/vmparam.h +++ b/sys/arch/amiga/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.14 1996/04/21 21:13:23 veego Exp $ */ +/* $NetBSD: vmparam.h,v 1.15 1997/06/12 15:09:24 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -84,16 +84,6 @@ #define MAXSSIZ (32*1024*1024) /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX NBPG /* largest potential swap allocation */ - /* * Sizes of the system and user portions of the system page table. */ diff --git a/sys/arch/arm32/include/vmparam.h b/sys/arch/arm32/include/vmparam.h index 720bddcfa369..b09ca4c0d7df 100644 --- a/sys/arch/arm32/include/vmparam.h +++ b/sys/arch/arm32/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.4 1996/12/27 01:55:48 mark Exp $ */ +/* $NetBSD: vmparam.h,v 1.5 1997/06/12 15:09:26 mrg Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -57,15 +57,6 @@ #define MAXSSIZ (8*1024*1024) /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ -#define DMTEXT 1024 /* swap allocation for text */ - /* * Size of shared memory map */ diff --git a/sys/arch/atari/include/vmparam.h b/sys/arch/atari/include/vmparam.h index 07025dfa6c5a..87303f3708f4 100644 --- a/sys/arch/atari/include/vmparam.h +++ b/sys/arch/atari/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.1.1.1 1995/03/26 07:12:07 leo Exp $ */ +/* $NetBSD: vmparam.h,v 1.2 1997/06/12 15:09:27 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -85,16 +85,6 @@ #define MAXSSIZ MAXDSIZ /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX NBPG /* largest potential swap allocation */ - /* * Sizes of the system and user portions of the system page table. */ diff --git a/sys/arch/hp300/include/vmparam.h b/sys/arch/hp300/include/vmparam.h index 543eca693f00..1de08e29ee88 100644 --- a/sys/arch/hp300/include/vmparam.h +++ b/sys/arch/hp300/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.10 1997/03/15 22:02:24 thorpej Exp $ */ +/* $NetBSD: vmparam.h,v 1.11 1997/06/12 15:09:28 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -83,16 +83,6 @@ #define MAXSSIZ MAXDSIZ /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ - /* * Sizes of the system and user portions of the system page table. */ diff --git a/sys/arch/i386/include/vmparam.h b/sys/arch/i386/include/vmparam.h index 78561f9d6765..33683ef2369a 100644 --- a/sys/arch/i386/include/vmparam.h +++ b/sys/arch/i386/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.18 1997/03/05 23:51:47 fvdl Exp $ */ +/* $NetBSD: vmparam.h,v 1.19 1997/06/12 15:09:29 mrg Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -74,15 +74,6 @@ #define MAXSSIZ (32*1024*1024) /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ -#define DMTEXT 1024 /* swap allocation for text */ - /* * Size of shared memory map */ diff --git a/sys/arch/mac68k/include/vmparam.h b/sys/arch/mac68k/include/vmparam.h index f4958e403005..0baf24eda34d 100644 --- a/sys/arch/mac68k/include/vmparam.h +++ b/sys/arch/mac68k/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.8 1996/11/15 14:21:00 briggs Exp $ */ +/* $NetBSD: vmparam.h,v 1.9 1997/06/12 15:09:30 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -116,16 +116,6 @@ #define MAXSSIZ MAXDSIZ /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ - /* * Sizes of the system and user portions of the system page table. */ diff --git a/sys/arch/mips/include/vmparam.h b/sys/arch/mips/include/vmparam.h index 1e7cc3c2dd35..9c5d1eda80c6 100644 --- a/sys/arch/mips/include/vmparam.h +++ b/sys/arch/mips/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.6 1996/10/16 06:10:41 jonathan Exp $ */ +/* $NetBSD: vmparam.h,v 1.7 1997/06/12 15:09:32 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -77,16 +77,6 @@ #define MAXSSIZ (32*1024*1024) /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ - /* * Sizes of the system and user portions of the system page table. */ diff --git a/sys/arch/mvme68k/include/vmparam.h b/sys/arch/mvme68k/include/vmparam.h index 37431322b3f8..7d612907a8d0 100644 --- a/sys/arch/mvme68k/include/vmparam.h +++ b/sys/arch/mvme68k/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.2 1996/04/26 19:40:57 chuck Exp $ */ +/* $NetBSD: vmparam.h,v 1.3 1997/06/12 15:09:33 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -83,16 +83,6 @@ #define MAXSSIZ MAXDSIZ /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ - /* * Sizes of the system and user portions of the system page table. */ diff --git a/sys/arch/ofppc/include/vmparam.h b/sys/arch/ofppc/include/vmparam.h index d01b0c867f8b..3b342b281d5a 100644 --- a/sys/arch/ofppc/include/vmparam.h +++ b/sys/arch/ofppc/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.2 1997/04/16 23:03:52 thorpej Exp $ */ +/* $NetBSD: vmparam.h,v 1.3 1997/06/12 15:09:36 mrg Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -54,12 +54,6 @@ #define MAXSSIZ (32*1024*1024) /* max stack size */ #endif -/* - * Min & Max swap space allocation chunks - */ -#define DMMIN 32 -#define DMMAX 4096 - /* * Size of shared memory map */ diff --git a/sys/arch/pc532/include/vmparam.h b/sys/arch/pc532/include/vmparam.h index 189fe1e37894..264237aa872c 100644 --- a/sys/arch/pc532/include/vmparam.h +++ b/sys/arch/pc532/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.9 1997/06/01 19:23:08 phil Exp $ */ +/* $NetBSD: vmparam.h,v 1.10 1997/06/12 15:09:35 mrg Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -81,15 +81,6 @@ #define MAXSSIZ (8*1024*1024) /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ -#define DMTEXT 1024 /* swap allocation for text */ - /* * PTEs for mapping user space into the kernel for phyio operations. * One page is enough to handle 4Mb of simultaneous raw IO operations. diff --git a/sys/arch/powerpc/include/vmparam.h b/sys/arch/powerpc/include/vmparam.h index d01b0c867f8b..3b342b281d5a 100644 --- a/sys/arch/powerpc/include/vmparam.h +++ b/sys/arch/powerpc/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.2 1997/04/16 23:03:52 thorpej Exp $ */ +/* $NetBSD: vmparam.h,v 1.3 1997/06/12 15:09:36 mrg Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -54,12 +54,6 @@ #define MAXSSIZ (32*1024*1024) /* max stack size */ #endif -/* - * Min & Max swap space allocation chunks - */ -#define DMMIN 32 -#define DMMAX 4096 - /* * Size of shared memory map */ diff --git a/sys/arch/sparc/include/vmparam.h b/sys/arch/sparc/include/vmparam.h index 55a7ed61c66e..01cb18521e24 100644 --- a/sys/arch/sparc/include/vmparam.h +++ b/sys/arch/sparc/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.11 1996/11/12 21:08:51 pk Exp $ */ +/* $NetBSD: vmparam.h,v 1.12 1997/06/12 15:09:37 mrg Exp $ */ /* * Copyright (c) 1992, 1993 @@ -74,17 +74,6 @@ #define MAXSSIZ MAXDSIZ /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX NBPG /* largest potential swap allocation */ -#define DMTEXT 1024 /* swap allocation for text */ - /* * Size of shared memory map */ diff --git a/sys/arch/sun3/include/vmparam.h b/sys/arch/sun3/include/vmparam.h index 636fd44b435d..7beb1a460bdb 100644 --- a/sys/arch/sun3/include/vmparam.h +++ b/sys/arch/sun3/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.17 1997/05/29 21:18:42 gwr Exp $ */ +/* $NetBSD: vmparam.h,v 1.18 1997/06/12 15:09:38 mrg Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross @@ -82,16 +82,6 @@ #define MAXSSIZ MAXDSIZ /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ - /* * PTEs for mapping user space into the kernel for phyio operations. * The actual limitation for physio requests will be the DVMA space, diff --git a/sys/arch/sun3/include/vmparam3.h b/sys/arch/sun3/include/vmparam3.h index 4a93a60028ec..00204d3f1226 100644 --- a/sys/arch/sun3/include/vmparam3.h +++ b/sys/arch/sun3/include/vmparam3.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam3.h,v 1.17 1997/05/29 21:18:42 gwr Exp $ */ +/* $NetBSD: vmparam3.h,v 1.18 1997/06/12 15:09:38 mrg Exp $ */ /* * Copyright (c) 1994 Gordon W. Ross @@ -82,16 +82,6 @@ #define MAXSSIZ MAXDSIZ /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ - /* * PTEs for mapping user space into the kernel for phyio operations. * The actual limitation for physio requests will be the DVMA space, diff --git a/sys/arch/sun3/include/vmparam3x.h b/sys/arch/sun3/include/vmparam3x.h index 764905636b37..8592fc095d5f 100644 --- a/sys/arch/sun3/include/vmparam3x.h +++ b/sys/arch/sun3/include/vmparam3x.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam3x.h,v 1.1.1.1 1997/01/14 20:57:07 gwr Exp $ */ +/* $NetBSD: vmparam3x.h,v 1.2 1997/06/12 15:09:39 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -72,16 +72,6 @@ #define MAXSSIZ (32*1024*1024) /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ - /* * PTEs for mapping user space into the kernel for phyio operations. * The actual limitation for physio requests will be the DVMA space, diff --git a/sys/arch/sun3x/include/vmparam.h b/sys/arch/sun3x/include/vmparam.h index a1772d7d703c..c1be15b7799e 100644 --- a/sys/arch/sun3x/include/vmparam.h +++ b/sys/arch/sun3x/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.1.1.1 1997/01/14 20:57:07 gwr Exp $ */ +/* $NetBSD: vmparam.h,v 1.2 1997/06/12 15:09:39 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -72,16 +72,6 @@ #define MAXSSIZ (32*1024*1024) /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ - /* * PTEs for mapping user space into the kernel for phyio operations. * The actual limitation for physio requests will be the DVMA space, diff --git a/sys/arch/vax/include/vmparam.h b/sys/arch/vax/include/vmparam.h index a1813e7c34f9..8b16472fea97 100644 --- a/sys/arch/vax/include/vmparam.h +++ b/sys/arch/vax/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.13 1997/02/12 17:52:59 ragge Exp $ */ +/* $NetBSD: vmparam.h,v 1.14 1997/06/12 15:09:40 mrg Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -88,16 +88,6 @@ */ #define MMAPSPACE (24*1024*1024) -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - */ - -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX 4096 /* largest potential swap allocation */ -#define DMTEXT 1024 /* swap allocation for text */ - /* * Size of shared memory map */ diff --git a/sys/arch/x68k/include/vmparam.h b/sys/arch/x68k/include/vmparam.h index 0a28ef83542a..252164a81452 100644 --- a/sys/arch/x68k/include/vmparam.h +++ b/sys/arch/x68k/include/vmparam.h @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.1.1.1 1996/05/05 12:17:03 oki Exp $ */ +/* $NetBSD: vmparam.h,v 1.2 1997/06/12 15:09:42 mrg Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -78,16 +78,6 @@ #define MAXSSIZ MAXDSIZ /* max stack size */ #endif -/* - * Default sizes of swap allocation chunks (see dmap.h). - * The actual values may be changed in vminit() based on MAXDSIZ. - * With MAXDSIZ of 16Mb and NDMAP of 38, dmmax will be 1024. - * DMMIN should be at least ctod(1) so that vtod() works. - * vminit() insures this. - */ -#define DMMIN 32 /* smallest swap allocation */ -#define DMMAX NBPG /* largest potential swap allocation */ - /* * Sizes of the system and user portions of the system page table. */