From: deraadt <deraadt@openbsd.org>
Date: Fri, 20 Sep 1996 06:44:45 +0000 (+0000)
Subject: do not fool people into thinking VNODEPAGER is an option; netbsd pr#2757, erik@aarhus... 
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=aa9e731a69645aad00ff66fed20f2eb1ddad0858;p=openbsd

do not fool people into thinking VNODEPAGER is an option; netbsd pr#2757, erik@aarhus1.uni-c.dk
---

diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA
index 55b48c9e5d6..084b89e53c6 100644
--- a/sys/arch/alpha/conf/ALPHA
+++ b/sys/arch/alpha/conf/ALPHA
@@ -1,4 +1,4 @@
-#	$OpenBSD: ALPHA,v 1.6 1996/07/29 20:01:22 niklas Exp $
+#	$OpenBSD: ALPHA,v 1.7 1996/09/20 06:44:49 deraadt Exp $
 #	$NetBSD: ALPHA,v 1.14.4.4 1996/06/13 19:21:59 cgd Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
@@ -20,7 +20,7 @@ options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
 options		DST=1			# Daylight savings rules (for param.c)
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER # Paging (mandatory)
+options		SWAPPAGER, DEVPAGER	# Paging (mandatory)
 options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
 options		KTRACE			# System call tracing support
 
diff --git a/sys/arch/alpha/conf/BUNNY b/sys/arch/alpha/conf/BUNNY
index bb141de4dcc..88803eec57e 100644
--- a/sys/arch/alpha/conf/BUNNY
+++ b/sys/arch/alpha/conf/BUNNY
@@ -1,4 +1,4 @@
-#	$OpenBSD: BUNNY,v 1.5 1996/07/29 20:01:23 niklas Exp $
+#	$OpenBSD: BUNNY,v 1.6 1996/09/20 06:44:50 deraadt Exp $
 #	$NetBSD: BUNNY,v 1.5.4.1 1996/06/13 19:22:03 cgd Exp $
 #
 # Kernel for bunnahabhain.pdl.cs.cmu.edu.
@@ -21,7 +21,7 @@ options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
 options		DST=1			# Daylight savings rules (for param.c)
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER # Paging (mandatory)
+options		SWAPPAGER, DEVPAGER	# Paging (mandatory)
 options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
 options		KTRACE			# System call tracing support
 
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index c623c267dba..801a4e0fde1 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.7 1996/07/29 20:01:23 niklas Exp $
+#	$OpenBSD: GENERIC,v 1.8 1996/09/20 06:44:50 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.15.4.3 1996/06/13 19:22:07 cgd Exp $
 #
 # Generic Alpha kernel.  Enough to get booted, etc., but not much more.
@@ -20,7 +20,7 @@ options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
 options		DST=1			# Daylight savings rules (for param.c)
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER # Paging (mandatory)
+options		SWAPPAGER, DEVPAGER	# Paging (mandatory)
 options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
 options		KTRACE			# System call tracing support
 
diff --git a/sys/arch/alpha/conf/JURA b/sys/arch/alpha/conf/JURA
index e9f5bbe905e..de3ab57d1e4 100644
--- a/sys/arch/alpha/conf/JURA
+++ b/sys/arch/alpha/conf/JURA
@@ -1,4 +1,4 @@
-#	$OpenBSD: JURA,v 1.5 1996/07/29 20:01:24 niklas Exp $
+#	$OpenBSD: JURA,v 1.6 1996/09/20 06:44:51 deraadt Exp $
 #	$NetBSD: JURA,v 1.6.4.1 1996/06/13 19:22:10 cgd Exp $
 #
 # Kernel for jura.pdl.cs.cmu.edu.
@@ -19,7 +19,7 @@ options		TIMEZONE="5*60"		# Minutes west of GMT (for param.c)
 options		DST=1			# Daylight savings rules (for param.c)
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER # Paging (mandatory)
+options		SWAPPAGER, DEVPAGER	# Paging (mandatory)
 options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
 options		KTRACE			# System call tracing support
 
diff --git a/sys/arch/alpha/conf/NOSY b/sys/arch/alpha/conf/NOSY
index 8c802a2b111..5fddc1c81e5 100644
--- a/sys/arch/alpha/conf/NOSY
+++ b/sys/arch/alpha/conf/NOSY
@@ -1,4 +1,4 @@
-#	$OpenBSD: NOSY,v 1.3 1996/07/29 20:01:26 niklas Exp $
+#	$OpenBSD: NOSY,v 1.4 1996/09/20 06:44:51 deraadt Exp $
 #	$NetBSD: NOSY,v 1.5.4.2 1996/06/13 19:22:15 cgd Exp $
 #
 # Jason's DEC 3000/400 in the lab...
@@ -16,7 +16,7 @@ options		TIMEZONE="8*60"		# Minutes west of GMT (for param.c)
 options		DST=1			# Daylight savings rules (for param.c)
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER # Paging (mandatory)
+options		SWAPPAGER, DEVPAGER	# Paging (mandatory)
 options		DEBUG, DIAGNOSTIC	# Extra kernel debugging
 options		KTRACE			# System call tracing support
 
diff --git a/sys/arch/alpha/conf/OPAL b/sys/arch/alpha/conf/OPAL
index 09f6223c95e..af1be26d67e 100644
--- a/sys/arch/alpha/conf/OPAL
+++ b/sys/arch/alpha/conf/OPAL
@@ -1,4 +1,4 @@
-#	$OpenBSD: OPAL,v 1.2 1996/08/23 11:51:57 niklas Exp $
+#	$OpenBSD: OPAL,v 1.3 1996/09/20 06:44:52 deraadt Exp $
 #
 # OPAL, kernel for a DEC Multia at Applitron
 
@@ -14,7 +14,7 @@ option		TIMEZONE="-1*60"	# Minutes west of GMT (for param.c)
 option		DST=1			# Daylight savings rules (for param.c)
 
 # Standard system options
-option		SWAPPAGER, VNODEPAGER, DEVPAGER # Paging (mandatory)
+option		SWAPPAGER, DEVPAGER	# Paging (mandatory)
 option		DEBUG, DIAGNOSTIC	# Extra kernel debugging
 option		KTRACE			# System call tracing support
 #option		DDB			# Kernel debugger (not yet supported)
diff --git a/sys/arch/amiga/conf/A3000 b/sys/arch/amiga/conf/A3000
index 4409180a277..5b9ec888da6 100644
--- a/sys/arch/amiga/conf/A3000
+++ b/sys/arch/amiga/conf/A3000
@@ -40,7 +40,6 @@ options		NULLFS		# Loopback filesystem
 options		FIFO		# FIFO operations on vnodes
 
 options		SWAPPAGER	# Pager for swap device
-options		VNODEPAGER	# Pager for vnodes
 options		DEVPAGER	# Pager
 
 #
diff --git a/sys/arch/amiga/conf/COFFEE b/sys/arch/amiga/conf/COFFEE
index 50370189d41..2c07b9ff556 100644
--- a/sys/arch/amiga/conf/COFFEE
+++ b/sys/arch/amiga/conf/COFFEE
@@ -1,4 +1,4 @@
-#	$OpenBSD: COFFEE,v 1.5 1996/08/31 02:08:57 deraadt Exp $
+#	$OpenBSD: COFFEE,v 1.6 1996/09/20 06:44:53 deraadt Exp $
 #	$NetBSD: COFFEE,v 1.12 1995/10/09 02:08:35 chopps Exp $
 
 #
@@ -22,7 +22,6 @@ option		"M68020"	# support for 020/851
 option		FPCOPROC	# Support for MC6888[12] (Required)
 
 option		SWAPPAGER	# Pager for processes (Required)
-option		VNODEPAGER	# Pager for vnodes (Required)
 option		DEVPAGER	# Pager for devices (Required)
 
 #
diff --git a/sys/arch/amiga/conf/CRASH b/sys/arch/amiga/conf/CRASH
index 8c6cd896b48..4c46af9511e 100644
--- a/sys/arch/amiga/conf/CRASH
+++ b/sys/arch/amiga/conf/CRASH
@@ -1,4 +1,4 @@
-#	$OpenBSD: CRASH,v 1.3 1996/08/31 02:08:58 deraadt Exp $
+#	$OpenBSD: CRASH,v 1.4 1996/09/20 06:44:54 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.56 1996/04/30 17:40:34 is Exp $
 
 #
@@ -24,7 +24,6 @@ options		"M68020"	# support for 020/851
 options		FPCOPROC	# Support for MC6888[12] (Required)
 
 options		SWAPPAGER	# Pager for processes (Required)
-options		VNODEPAGER	# Pager for vnodes (Required)
 options		DEVPAGER	# Pager for devices (Required)
 
 #
diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO
index 01b8e4f2fa1..1877e692cc3 100644
--- a/sys/arch/amiga/conf/DRACO
+++ b/sys/arch/amiga/conf/DRACO
@@ -28,7 +28,6 @@ option		FPCOPROC	# Support for MC6888[12] (Required)
 #
 
 option		SWAPPAGER	# Pager for processes (Required)
-option		VNODEPAGER	# Pager for vnodes (Required)
 option		DEVPAGER	# Pager for devices (Required)
 
 #
diff --git a/sys/arch/amiga/conf/FILIPPA b/sys/arch/amiga/conf/FILIPPA
index 2492f5e37a3..51d71846f30 100644
--- a/sys/arch/amiga/conf/FILIPPA
+++ b/sys/arch/amiga/conf/FILIPPA
@@ -1,4 +1,4 @@
-#	$OpenBSD: FILIPPA,v 1.9 1996/09/04 22:51:33 niklas Exp $
+#	$OpenBSD: FILIPPA,v 1.10 1996/09/20 06:44:55 deraadt Exp $
 
 #
 # Niklas' AMIGA with ISA support
@@ -19,7 +19,6 @@ option		FPSP		# MC68040 floating point support
 option		FPCOPROC	# Support for MC6888[12] (Required)
 
 option		SWAPPAGER	# Pager for processes (Required)
-option		VNODEPAGER	# Pager for vnodes (Required)
 option		DEVPAGER	# Pager for devices (Required)
 
 #
diff --git a/sys/arch/amiga/conf/INSTALL b/sys/arch/amiga/conf/INSTALL
index a7ebf2ad589..2431bf46370 100644
--- a/sys/arch/amiga/conf/INSTALL
+++ b/sys/arch/amiga/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$OpenBSD: INSTALL,v 1.4 1996/08/31 02:09:00 deraadt Exp $
+#	$OpenBSD: INSTALL,v 1.5 1996/09/20 06:44:55 deraadt Exp $
 #	$NetBSD: INSTALL,v 1.2.2.1 1996/05/30 21:25:49 is Exp $
 
 #
@@ -33,7 +33,6 @@ option		DRACO
 #
 
 option		SWAPPAGER	# Pager for processes (Required)
-option		VNODEPAGER	# Pager for vnodes (Required)
 option		DEVPAGER	# Pager for devices (Required)
 
 #
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index 340d023ad6d..7488bf43ca9 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.5 1996/09/15 09:46:07 pefo Exp $
+#	$OpenBSD: GENERIC,v 1.6 1996/09/20 06:44:56 deraadt Exp $
 #
 #	Generic configuration file for MIPS R4x00 ARC Systems
 #
@@ -13,7 +13,6 @@ options		DST=0			# use daylight savings rules
 
 # Standard system options
 options		SWAPPAGER		# swap pager (anonymous and swap space)
-options		VNODEPAGER		# vnode pager (mapped files)
 options		DEVPAGER		# device pager (mapped devices)
 
 options		DIAGNOSTIC		# extra kernel debugging checks
diff --git a/sys/arch/arc/conf/PICA b/sys/arch/arc/conf/PICA
index 19da0300699..596402ca623 100644
--- a/sys/arch/arc/conf/PICA
+++ b/sys/arch/arc/conf/PICA
@@ -12,7 +12,6 @@ options		DST=1			# use daylight savings rules
 
 # Standard system options
 options		SWAPPAGER		# swap pager (anonymous and swap space)
-options		VNODEPAGER		# vnode pager (mapped files)
 options		DEVPAGER		# device pager (mapped devices)
 options		DIAGNOSTIC		# extra kernel debugging checks
 options		DEBUG			# extra kernel debugging support
diff --git a/sys/arch/arm32/conf/BETA b/sys/arch/arm32/conf/BETA
index e4dbabf358e..c2559a8d488 100644
--- a/sys/arch/arm32/conf/BETA
+++ b/sys/arch/arm32/conf/BETA
@@ -13,7 +13,6 @@ maxusers	8
 options		TIMEZONE=0	# time zone to adjust RTC time by
 options		DST=0		# daylight savings time used by RTC
 options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
 options		DEVPAGER	# mmap() of devices
 
 # CPU options
diff --git a/sys/arch/arm32/conf/CLAIRE b/sys/arch/arm32/conf/CLAIRE
index 88da4a443e5..175914fc3dd 100644
--- a/sys/arch/arm32/conf/CLAIRE
+++ b/sys/arch/arm32/conf/CLAIRE
@@ -13,7 +13,6 @@ maxusers	8
 options		TIMEZONE=0	# time zone to adjust RTC time by
 options		DST=0		# daylight savings time used by RTC
 options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
 options		DEVPAGER	# mmap() of devices
 
 # CPU options
diff --git a/sys/arch/arm32/conf/GENERIC b/sys/arch/arm32/conf/GENERIC
index c7def26d916..8088e7bf130 100644
--- a/sys/arch/arm32/conf/GENERIC
+++ b/sys/arch/arm32/conf/GENERIC
@@ -13,7 +13,6 @@ maxusers	32
 options		TIMEZONE=0	# time zone to adjust RTC time by
 options		DST=0		# daylight savings time used by RTC
 options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
 options		DEVPAGER	# mmap() of devices
 
 # CPU options
diff --git a/sys/arch/arm32/conf/PHARM b/sys/arch/arm32/conf/PHARM
index ac37fbcb863..d8146f16494 100644
--- a/sys/arch/arm32/conf/PHARM
+++ b/sys/arch/arm32/conf/PHARM
@@ -13,7 +13,6 @@ maxusers	32
 options		TIMEZONE=0	# time zone to adjust RTC time by
 options		DST=0		# daylight savings time used by RTC
 options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
 options		DEVPAGER	# mmap() of devices
 
 # CPU options
diff --git a/sys/arch/arm32/conf/REMY b/sys/arch/arm32/conf/REMY
index 7723a451a22..7cc66cf4395 100644
--- a/sys/arch/arm32/conf/REMY
+++ b/sys/arch/arm32/conf/REMY
@@ -13,7 +13,6 @@ maxusers	8
 options		TIMEZONE=0	# time zone to adjust RTC time by
 options		DST=0		# daylight savings time used by RTC
 options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
 options		DEVPAGER	# mmap() of devices
 
 # CPU options
diff --git a/sys/arch/arm32/conf/VOYAGER b/sys/arch/arm32/conf/VOYAGER
index adc0378d9f8..1da127ca959 100644
--- a/sys/arch/arm32/conf/VOYAGER
+++ b/sys/arch/arm32/conf/VOYAGER
@@ -13,7 +13,6 @@ maxusers	32
 options		TIMEZONE=0	# time zone to adjust RTC time by
 options		DST=0		# daylight savings time used by RTC
 options		SWAPPAGER	# paging; REQUIRED
-options		VNODEPAGER	# mmap() of files
 options		DEVPAGER	# mmap() of devices
 
 # CPU options
diff --git a/sys/arch/atari/conf/ATARITT b/sys/arch/atari/conf/ATARITT
index c8cf2209e96..7c5199f8680 100644
--- a/sys/arch/atari/conf/ATARITT
+++ b/sys/arch/atari/conf/ATARITT
@@ -40,7 +40,6 @@ options		CD9660		# ISO 9660 filesystem with Rock Ridge
 options		FIFO		# FIFO operations on vnodes
 
 options		SWAPPAGER	# Pager for swap device
-options		VNODEPAGER	# Pager for vnodes
 options		DEVPAGER	# Pager
 
 
diff --git a/sys/arch/atari/conf/BOOT b/sys/arch/atari/conf/BOOT
index aad736bbbe1..d23b92d7eee 100644
--- a/sys/arch/atari/conf/BOOT
+++ b/sys/arch/atari/conf/BOOT
@@ -44,7 +44,6 @@ options		CD9660		# ISO 9660 filesystem with Rock Ridge
 options		FIFO		# FIFO operations on vnodes
 
 options		SWAPPAGER	# Pager for swap device
-options		VNODEPAGER	# Pager for vnodes
 options		DEVPAGER	# Pager
 
 
diff --git a/sys/arch/atari/conf/FALCON b/sys/arch/atari/conf/FALCON
index 118767a2cec..05754cd4815 100644
--- a/sys/arch/atari/conf/FALCON
+++ b/sys/arch/atari/conf/FALCON
@@ -38,7 +38,6 @@ options		CD9660		# ISO 9660 filesystem with Rock Ridge
 options		FIFO		# FIFO operations on vnodes
 
 options		SWAPPAGER	# Pager for swap device
-options		VNODEPAGER	# Pager for vnodes
 options		DEVPAGER	# Pager
 
 
diff --git a/sys/arch/atari/conf/GENERIC b/sys/arch/atari/conf/GENERIC
index 4ae036528fa..2a947fbb4e7 100644
--- a/sys/arch/atari/conf/GENERIC
+++ b/sys/arch/atari/conf/GENERIC
@@ -39,7 +39,6 @@ options		CD9660		# ISO 9660 filesystem with Rock Ridge
 options		FIFO		# FIFO operations on vnodes
 
 options		SWAPPAGER	# Pager for swap device
-options		VNODEPAGER	# Pager for vnodes
 options		DEVPAGER	# Pager
 
 
diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS
index c8840e76d5b..58e4791aeb2 100644
--- a/sys/arch/hp300/conf/DISKLESS
+++ b/sys/arch/hp300/conf/DISKLESS
@@ -20,7 +20,6 @@ maxusers	8
 
 # Standard system options
 options		SWAPPAGER		# swap pager (anonymous and swap space)
-options		VNODEPAGER		# vnode pager (mapped files)
 options		DEVPAGER		# device pager (mapped devices)
 options         "COMPAT_43"             # compatibility with 4.3BSD interfaces
 options         "COMPAT_44"             # compatibility with 4.4BSD binaries
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 6f38e399f38..a1810cabe53 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -20,7 +20,6 @@ maxusers	32
 
 # Standard system options
 options		SWAPPAGER		# swap pager (anonymous and swap space)
-options		VNODEPAGER		# vnode pager (mapped files)
 options		DEVPAGER		# device pager (mapped devices)
 options         "COMPAT_43"             # compatibility with 4.3BSD interfaces
 options         "COMPAT_44"             # compatibility with 4.4BSD binaries
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index 0afbc7cef14..78b2792cd12 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-#	$OpenBSD: ALL,v 1.8 1996/09/04 21:20:44 deraadt Exp $
+#	$OpenBSD: ALL,v 1.9 1996/09/20 06:45:04 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
 #
 #	ALL -- everything that's currently supported
@@ -26,7 +26,6 @@ option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 option		DDB		# in-kernel debugger
diff --git a/sys/arch/i386/conf/BABY b/sys/arch/i386/conf/BABY
index 3e352bce1d5..1a7d787b509 100644
--- a/sys/arch/i386/conf/BABY
+++ b/sys/arch/i386/conf/BABY
@@ -1,4 +1,4 @@
-#	$OpenBSD: BABY,v 1.8 1996/09/12 21:55:06 deraadt Exp $
+#	$OpenBSD: BABY,v 1.9 1996/09/20 06:45:04 deraadt Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -23,7 +23,6 @@ option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 option		DDB		# in-kernel debugger
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index e6d5da7c21c..230431486a9 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$OpenBSD: DISKLESS,v 1.13 1996/08/31 02:09:14 deraadt Exp $
+#	$OpenBSD: DISKLESS,v 1.14 1996/09/20 06:45:05 deraadt Exp $
 #	$NetBSD: DISKLESS,v 1.26 1996/05/20 18:17:16 mrg Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
@@ -26,7 +26,6 @@ option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 option		DDB		# in-kernel debugger
diff --git a/sys/arch/i386/conf/GANDALF b/sys/arch/i386/conf/GANDALF
index f2bf7e4f142..b2817c00cdb 100644
--- a/sys/arch/i386/conf/GANDALF
+++ b/sys/arch/i386/conf/GANDALF
@@ -1,7 +1,7 @@
 #
 #	GANDALF -- Dual Tyan P5/133 PCI/EISA bus
 #
-#	$OpenBSD: GANDALF,v 1.12 1996/09/14 18:36:15 tholo Exp $
+#	$OpenBSD: GANDALF,v 1.13 1996/09/20 06:45:05 deraadt Exp $
 #
 
 machine		i386		# architecture, used by config; REQUIRED
@@ -24,7 +24,6 @@ option		DST=1		# daylight savings time used by RTC
 option		NTP		# High precision timekeeping support
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 #option		DDB		# in-kernel debugger
diff --git a/sys/arch/i386/conf/HELIOS_PCMCIA b/sys/arch/i386/conf/HELIOS_PCMCIA
index 4087eedd844..26e5ee8fc3b 100644
--- a/sys/arch/i386/conf/HELIOS_PCMCIA
+++ b/sys/arch/i386/conf/HELIOS_PCMCIA
@@ -1,4 +1,4 @@
-#	$OpenBSD: HELIOS_PCMCIA,v 1.9 1996/07/31 18:35:17 deraadt Exp $
+#	$OpenBSD: HELIOS_PCMCIA,v 1.10 1996/09/20 06:45:06 deraadt Exp $
 #
 #	HELIOS_PCMCIA -- Eric Hvozda's notebook
 #
@@ -15,7 +15,6 @@ option		TIMEZONE=300	# time zone to adjust RTC time by
 option		DST=1		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 option		DIAGNOSTIC	# internally consistency checks
diff --git a/sys/arch/i386/conf/INST b/sys/arch/i386/conf/INST
index 1b7d3b94ec2..8fbd4369036 100644
--- a/sys/arch/i386/conf/INST
+++ b/sys/arch/i386/conf/INST
@@ -1,4 +1,4 @@
-#	$OpenBSD: INST,v 1.10 1996/08/31 17:35:37 deraadt Exp $
+#	$OpenBSD: INST,v 1.11 1996/09/20 06:45:06 deraadt Exp $
 #	$NetBSD: INSTADP,v 1.17 1996/05/20 03:32:19 thorpej Exp $
 #
 #       Install kernels no longer support X.
@@ -23,7 +23,6 @@ option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 #makeoptions	DEBUG="-g"	# compile full symbol table
diff --git a/sys/arch/i386/conf/LAP b/sys/arch/i386/conf/LAP
index c5cdf6b774b..20a22d5858a 100644
--- a/sys/arch/i386/conf/LAP
+++ b/sys/arch/i386/conf/LAP
@@ -1,4 +1,4 @@
-#	$OpenBSD: LAP,v 1.11 1996/08/31 02:09:15 deraadt Exp $
+#	$OpenBSD: LAP,v 1.12 1996/09/20 06:45:07 deraadt Exp $
 #	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
 #
 #	TDR -- Theo Deraadt's 486
@@ -24,7 +24,6 @@ maxusers	10		# estimated number of users
 #option		DST=0		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 option		DDB		# in-kernel debugger
diff --git a/sys/arch/i386/conf/NETTAN b/sys/arch/i386/conf/NETTAN
index 1fa325d34b0..a71a34e36fb 100644
--- a/sys/arch/i386/conf/NETTAN
+++ b/sys/arch/i386/conf/NETTAN
@@ -1,4 +1,4 @@
-#	$OpenBSD: NETTAN,v 1.12 1996/08/31 02:09:16 deraadt Exp $
+#	$OpenBSD: NETTAN,v 1.13 1996/09/20 06:45:08 deraadt Exp $
 #
 #	NETTAN -- Applitron Datasystem AB
 #
@@ -19,7 +19,6 @@ option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 option		DDB		# in-kernel debugger
diff --git a/sys/arch/i386/conf/OPRAH b/sys/arch/i386/conf/OPRAH
index 2b878202a97..4b6d5b40448 100644
--- a/sys/arch/i386/conf/OPRAH
+++ b/sys/arch/i386/conf/OPRAH
@@ -19,7 +19,6 @@ option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 option		DDB		# in-kernel debugger
diff --git a/sys/arch/i386/conf/PCMCIA b/sys/arch/i386/conf/PCMCIA
index e3eed2cf93f..aab104efaee 100644
--- a/sys/arch/i386/conf/PCMCIA
+++ b/sys/arch/i386/conf/PCMCIA
@@ -1,4 +1,4 @@
-#	$OpenBSD: PCMCIA,v 1.7 1996/08/31 02:09:17 deraadt Exp $
+#	$OpenBSD: PCMCIA,v 1.8 1996/09/20 06:45:09 deraadt Exp $
 #
 
 machine		i386		# architecture, used by config; REQUIRED
@@ -17,7 +17,6 @@ option		TIMEZONE=300	# time zone to adjust RTC time by
 option		DST=1		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 option		DDB		# in-kernel debugger
diff --git a/sys/arch/i386/conf/SPARE-PARTS b/sys/arch/i386/conf/SPARE-PARTS
index 0ad7e3f87d7..c24cb62d282 100644
--- a/sys/arch/i386/conf/SPARE-PARTS
+++ b/sys/arch/i386/conf/SPARE-PARTS
@@ -1,7 +1,7 @@
 #
 #	SPARE-PARTS: spare-parts.teeny.org, the teeny gateway to the world.
 #
-#	$OpenBSD: SPARE-PARTS,v 1.5 1996/09/16 10:10:46 downsj Exp $
+#	$OpenBSD: SPARE-PARTS,v 1.6 1996/09/20 06:45:09 deraadt Exp $
 #
 
 machine		i386
@@ -14,7 +14,6 @@ option		TIMEZONE=480
 option		DST=0
 
 option		SWAPPAGER
-option		VNODEPAGER
 option		DEVPAGER
 
 #option		DDB
diff --git a/sys/arch/i386/conf/TDR b/sys/arch/i386/conf/TDR
index 9c3afb6c347..48d133d595a 100644
--- a/sys/arch/i386/conf/TDR
+++ b/sys/arch/i386/conf/TDR
@@ -1,4 +1,4 @@
-#	$OpenBSD: TDR,v 1.16 1996/08/31 02:09:18 deraadt Exp $
+#	$OpenBSD: TDR,v 1.17 1996/09/20 06:45:10 deraadt Exp $
 #	$NetBSD: TDR,v 1.64 1996/03/25 05:45:49 perry Exp $
 #
 #	TDR -- Theo Deraadt's 486
@@ -24,7 +24,6 @@ option		TIMEZONE=420	# time zone to adjust RTC time by
 option		DST=1		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 option		DDB		# in-kernel debugger
diff --git a/sys/arch/i386/conf/THREADWAY b/sys/arch/i386/conf/THREADWAY
index 428c820ab63..83083318014 100644
--- a/sys/arch/i386/conf/THREADWAY
+++ b/sys/arch/i386/conf/THREADWAY
@@ -1,7 +1,7 @@
 #
 #	THREADWAY: threadway.teeny.org
 #
-#	$OpenBSD: THREADWAY,v 1.13 1996/08/31 02:09:18 deraadt Exp $
+#	$OpenBSD: THREADWAY,v 1.14 1996/09/20 06:45:10 deraadt Exp $
 #
 
 machine		i386
@@ -19,7 +19,6 @@ option		GPL_MATH_EMULATE
 option		ALWAYS_MATH_EMULATE
 
 option		SWAPPAGER
-option		VNODEPAGER
 option		DEVPAGER
 
 option		DDB
diff --git a/sys/arch/i386/conf/WALDORF b/sys/arch/i386/conf/WALDORF
index 5428f02daf8..59b18a69a12 100644
--- a/sys/arch/i386/conf/WALDORF
+++ b/sys/arch/i386/conf/WALDORF
@@ -20,7 +20,6 @@ option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 option		DDB		# in-kernel debugger
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index 8ef9d6f3474..1a466149516 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.8 1996/08/31 02:09:22 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.9 1996/09/20 06:45:11 deraadt Exp $
 #	$NetBSD: GENERIC,v 1.38 1996/08/05 01:52:13 scottr Exp $
 #
 # GENERIC
@@ -10,7 +10,7 @@ maxusers	16
 options         MAXFDESCS=2048
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+options		SWAPPAGER, DEVPAGER	# paging
 options		DIAGNOSTIC		# DEBUG for extra kernel debugging
 options		KTRACE			# system call tracing support
 #options	KGDB			# support for kernel gdb
diff --git a/sys/arch/mac68k/conf/OCELOT b/sys/arch/mac68k/conf/OCELOT
index ee73be31869..5dbb45f2620 100644
--- a/sys/arch/mac68k/conf/OCELOT
+++ b/sys/arch/mac68k/conf/OCELOT
@@ -1,4 +1,4 @@
-#	$OpenBSD: OCELOT,v 1.7 1996/08/31 02:09:22 deraadt Exp $
+#	$OpenBSD: OCELOT,v 1.8 1996/09/20 06:45:12 deraadt Exp $
 #	$NetBSD: OCELOT,v 1.11 1996/08/05 01:52:14 scottr Exp $
 #
 # OCELOT
@@ -8,7 +8,7 @@ include	"std.mac68k"
 maxusers	16
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+options		SWAPPAGER, DEVPAGER	# paging
 options		DIAGNOSTIC		# DEBUG for extra kernel debugging
 
 # Filesystem options
diff --git a/sys/arch/mac68k/conf/PUMA b/sys/arch/mac68k/conf/PUMA
index 6ba06434237..49da3f071d8 100644
--- a/sys/arch/mac68k/conf/PUMA
+++ b/sys/arch/mac68k/conf/PUMA
@@ -1,4 +1,4 @@
-#	$OpenBSD: PUMA,v 1.8 1996/09/01 18:57:04 briggs Exp $
+#	$OpenBSD: PUMA,v 1.9 1996/09/20 06:45:12 deraadt Exp $
 #	$NetBSD: PUMA,v 1.13 1996/08/05 01:52:15 scottr Exp $
 #
 # PUMA
@@ -10,7 +10,7 @@ maxusers	16
 options         MAXFDESCS=2048
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+options		SWAPPAGER, DEVPAGER	# paging
 
 # Filesystem options
 options		FIFO		# POSIX fifo support (in all filesystems)
diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK
index ef736d859c6..a07ea7a5bb2 100644
--- a/sys/arch/mac68k/conf/RAMDISK
+++ b/sys/arch/mac68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.6 1996/08/31 02:09:23 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.7 1996/09/20 06:45:13 deraadt Exp $
 #	$NetBSD: RAMDISK,v 1.6 1996/08/05 01:52:16 scottr Exp $
 
 # RAMDISK
@@ -14,7 +14,7 @@ options		RAMDISK_HOOKS
 options		MINIROOTSIZE=512	# 256K
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+options		SWAPPAGER, DEVPAGER	# paging
 
 # Filesystem options
 options		FIFO		# POSIX fifo support (in all filesystems)
diff --git a/sys/arch/mac68k/conf/SPOT b/sys/arch/mac68k/conf/SPOT
index 625b68a0693..568976afef7 100644
--- a/sys/arch/mac68k/conf/SPOT
+++ b/sys/arch/mac68k/conf/SPOT
@@ -1,4 +1,4 @@
-#	$OpenBSD: SPOT,v 1.5 1996/08/31 02:09:24 deraadt Exp $
+#	$OpenBSD: SPOT,v 1.6 1996/09/20 06:45:13 deraadt Exp $
 #	$NetBSD: SPOT,v 1.11 1996/08/05 01:52:17 scottr Exp $
 #
 # SPOT
@@ -11,7 +11,7 @@ makeoptions CC="cc -m68030"
 options         MAXFDESCS=2048
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+options		SWAPPAGER, DEVPAGER	# paging
 options		DIAGNOSTIC		# DEBUG for extra kernel debugging
 options		KTRACE			# system call tracing support
 #options	KGDB			# support for kernel gdb
diff --git a/sys/arch/mvme68k/conf/MVME147 b/sys/arch/mvme68k/conf/MVME147
index e95b0af140c..5f92eb19fc1 100644
--- a/sys/arch/mvme68k/conf/MVME147
+++ b/sys/arch/mvme68k/conf/MVME147
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME147,v 1.8 1996/08/31 02:09:25 deraadt Exp $
+#	$OpenBSD: MVME147,v 1.9 1996/09/20 06:45:14 deraadt Exp $
 
 machine		mvme68k m68k
 
@@ -26,7 +26,7 @@ option 	KTRACE
 option 	COMPAT_43
 option 	FIFO
 #option		MFS
-option		DEVPAGER, SWAPPAGER, VNODEPAGER
+option		DEVPAGER, SWAPPAGER
 #option		MSDOSFS
 
 option		COMPAT_SUNOS
diff --git a/sys/arch/mvme68k/conf/MVME162 b/sys/arch/mvme68k/conf/MVME162
index e08d5176ef0..98bb0bfdc52 100644
--- a/sys/arch/mvme68k/conf/MVME162
+++ b/sys/arch/mvme68k/conf/MVME162
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME162,v 1.8 1996/08/31 02:09:26 deraadt Exp $
+#	$OpenBSD: MVME162,v 1.9 1996/09/20 06:45:15 deraadt Exp $
 
 machine		mvme68k m68k
 
@@ -26,7 +26,7 @@ option 		KTRACE
 option 		COMPAT_43
 option 		FIFO
 #option		MFS
-option		DEVPAGER, SWAPPAGER, VNODEPAGER
+option		DEVPAGER, SWAPPAGER
 #option		MSDOSFS
 
 option		COMPAT_SUNOS
diff --git a/sys/arch/mvme68k/conf/MVME167 b/sys/arch/mvme68k/conf/MVME167
index b2ebc716604..76619840ca1 100644
--- a/sys/arch/mvme68k/conf/MVME167
+++ b/sys/arch/mvme68k/conf/MVME167
@@ -1,4 +1,4 @@
-#	$OpenBSD: MVME167,v 1.8 1996/08/31 02:09:26 deraadt Exp $
+#	$OpenBSD: MVME167,v 1.9 1996/09/20 06:45:15 deraadt Exp $
 
 machine		mvme68k m68k
 
@@ -26,7 +26,7 @@ option 		KTRACE
 option 		COMPAT_43
 option 		FIFO
 #option		MFS
-option		DEVPAGER, SWAPPAGER, VNODEPAGER
+option		DEVPAGER, SWAPPAGER
 #option		MSDOSFS
 
 option		COMPAT_SUNOS
diff --git a/sys/arch/mvme88k/conf/GENERIC b/sys/arch/mvme88k/conf/GENERIC
index 45275b37e79..4ca5ed587b4 100644
--- a/sys/arch/mvme88k/conf/GENERIC
+++ b/sys/arch/mvme88k/conf/GENERIC
@@ -1,7 +1,7 @@
 #
 # GENERIC AMIGA
 #
-#	$Id: GENERIC,v 1.3 1996/08/31 02:09:29 deraadt Exp $
+#	$Id: GENERIC,v 1.4 1996/09/20 06:45:16 deraadt Exp $
 #
 # This configuration file contains all possible options
 #
@@ -17,7 +17,6 @@ options		TIMEZONE=300, DST=1
 options		"M88000"	# support for 88K
 
 options		SWAPPAGER	# Pager for processes (Required)
-options		VNODEPAGER	# Pager for vnodes (Required)
 options		DEVPAGER	# Pager for devices (Required)
 
 #
diff --git a/sys/arch/mvme88k/conf/MYBOX b/sys/arch/mvme88k/conf/MYBOX
index 95e09afc470..d8872ff691d 100644
--- a/sys/arch/mvme88k/conf/MYBOX
+++ b/sys/arch/mvme88k/conf/MYBOX
@@ -1,11 +1,11 @@
-#	$Id: MYBOX,v 1.1.1.1 1995/10/18 10:54:18 deraadt Exp $
+#	$Id: MYBOX,v 1.2 1996/09/20 06:45:16 deraadt Exp $
 
 include "std.m88k"
 
 maxusers	8
 options		TIMEZONE=300, DST=1
 options		BYTE_MSF
-options		SWAPPAGER, VNODEPAGER, DEVPAGER
+options		SWAPPAGER, DEVPAGER
 #options		INET
 options		FFS, MFS, FDESC
 #options		"COMPAT_42", "COMPAT_43"
diff --git a/sys/arch/pc532/conf/DEFAULT b/sys/arch/pc532/conf/DEFAULT
index 47217dacfbe..624b38c21f4 100644
--- a/sys/arch/pc532/conf/DEFAULT
+++ b/sys/arch/pc532/conf/DEFAULT
@@ -9,7 +9,7 @@ machine		pc532
 maxusers	8			# estimated number of users
 options		TIMEZONE=0, DST=0	# time zone to read RTC in
 options		SWAPPAGER		# paging
-options		VNODEPAGER,DEVPAGER	# vnode and device node caching
+options		DEVPAGER		# device node caching
 
 #options	DDB			# kernel debugger; recommended
 #options	DIAGNOSTIC		# internal consistency checking
diff --git a/sys/arch/pc532/conf/INSTALL b/sys/arch/pc532/conf/INSTALL
index 4261d846ab3..d57b4758267 100644
--- a/sys/arch/pc532/conf/INSTALL
+++ b/sys/arch/pc532/conf/INSTALL
@@ -14,9 +14,8 @@ options		GENERIC
 # estimated number of users
 maxusers	2
 
-# paging of processes, and caching vnodes and devices; REQUIRED
+# paging of processes, and caching devices; REQUIRED
 options		SWAPPAGER
-options		VNODEPAGER
 options		DEVPAGER
 
 # networking options
diff --git a/sys/arch/pc532/conf/KLONDIKE b/sys/arch/pc532/conf/KLONDIKE
index d55a6c1dc0e..9b9818694a0 100644
--- a/sys/arch/pc532/conf/KLONDIKE
+++ b/sys/arch/pc532/conf/KLONDIKE
@@ -8,7 +8,7 @@ machine		pc532
 maxusers	8			# estimated number of users
 options		TIMEZONE=0, DST=0	# time zone to read RTC in
 options		SWAPPAGER		# paging
-options		VNODEPAGER,DEVPAGER	# vnode and device node caching
+options		DEVPAGER		# device node caching
 
 #options	DDB			# kernel debugger; recommended
 #options	DIAGNOSTIC		# internal consistency checking
diff --git a/sys/arch/pc532/conf/STEELHEAD b/sys/arch/pc532/conf/STEELHEAD
index 6bc89b96df9..d89314eccaa 100644
--- a/sys/arch/pc532/conf/STEELHEAD
+++ b/sys/arch/pc532/conf/STEELHEAD
@@ -7,7 +7,7 @@ machine		"pc532"
 maxusers	10			# estimated number of users
 options		TIMEZONE=0, DST=0	# time zone to read RTC in
 options		SWAPPAGER		# paging
-options		VNODEPAGER,DEVPAGER	# vnode and device node caching
+options		DEVPAGER		# device node caching
 #options	DDB			# kernel debugger; not working
 #options	DIAGNOSTIC		# internal consistency checking
 
diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC
index 2f22a07a147..8511153aedf 100644
--- a/sys/arch/pmax/conf/GENERIC
+++ b/sys/arch/pmax/conf/GENERIC
@@ -32,7 +32,6 @@ options		DST=0			# use daylight savings rules
 
 # Standard system options
 options		SWAPPAGER		# swap pager (anonymous and swap space)
-options		VNODEPAGER		# vnode pager (mapped files)
 options		DEVPAGER		# device pager (mapped devices)
 #options	DIAGNOSTIC		# extra kernel debugging checks
 options		DEBUG			# extra kernel debugging support
diff --git a/sys/arch/pmax/conf/MINIROOT b/sys/arch/pmax/conf/MINIROOT
index 15a77af722e..fadaa97bcb2 100644
--- a/sys/arch/pmax/conf/MINIROOT
+++ b/sys/arch/pmax/conf/MINIROOT
@@ -33,7 +33,6 @@ options		DST=0			# use daylight savings rules
 
 # Standard system options
 options		SWAPPAGER		# swap pager (anonymous and swap space)
-options		VNODEPAGER		# vnode pager (mapped files)
 options		DEVPAGER		# device pager (mapped devices)
 #options	DIAGNOSTIC		# extra kernel debugging checks
 options		DEBUG			# extra kernel debugging support
diff --git a/sys/arch/pmax/conf/NEWCONF b/sys/arch/pmax/conf/NEWCONF
index e9dd1f8592b..5daf259b4aa 100644
--- a/sys/arch/pmax/conf/NEWCONF
+++ b/sys/arch/pmax/conf/NEWCONF
@@ -34,7 +34,6 @@ options		DST=1			# use daylight savings rules
 
 # Standard system options
 options		SWAPPAGER		# swap pager (anonymous and swap space)
-options		VNODEPAGER		# vnode pager (mapped files)
 options		DEVPAGER		# device pager (mapped devices)
 #options	DIAGNOSTIC		# extra kernel debugging checks
 options		DEBUG			# extra kernel debugging support
diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4
index bd047e47af3..1a72f4b66bc 100644
--- a/sys/arch/sparc/conf/SUN4
+++ b/sys/arch/sparc/conf/SUN4
@@ -9,7 +9,7 @@ option		SUN4
 option		TIMEZONE=0, DST=0
 
 # Standard system options
-option		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+option		SWAPPAGER, DEVPAGER	# paging
 #option		DEBUG, DIAGNOSTIC	# extra kernel debugging
 option		KTRACE			# system call tracing support
 #option		KGDB			# support for kernel gdb
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 8948060897e..53e91f935fc 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -9,7 +9,7 @@ option		SUN4C
 option		TIMEZONE=0, DST=0
 
 # Standard system options
-option		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+option		SWAPPAGER, DEVPAGER	# paging
 #option		DEBUG, DIAGNOSTIC	# extra kernel debugging
 option		KTRACE			# system call tracing support
 #option		KGDB			# support for kernel gdb
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index d69de357f98..fe17b071167 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -10,7 +10,7 @@ option		SUN4M
 option		TIMEZONE=0, DST=0
 
 # Standard system options
-option		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+option		SWAPPAGER, DEVPAGER	# paging
 #option		DEBUG, DIAGNOSTIC	# extra kernel debugging
 option		KTRACE			# system call tracing support
 #option		KGDB			# support for kernel gdb
diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS
index 3d6dd78657f..4a8592cb886 100644
--- a/sys/arch/sun3/conf/DISKLESS
+++ b/sys/arch/sun3/conf/DISKLESS
@@ -16,7 +16,7 @@ options 	HAVECACHE		# Sun3/260 VAC
 maxusers	4
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+options		SWAPPAGER, DEVPAGER		# paging
 options		KTRACE				# system call tracing support
 #makeoptions	DEBUG="-g"			# symbols for kgdb + nm
 #options 	DDB
diff --git a/sys/arch/sun3/conf/FOUR_TTYS b/sys/arch/sun3/conf/FOUR_TTYS
index c4441611a60..bb5ea510136 100644
--- a/sys/arch/sun3/conf/FOUR_TTYS
+++ b/sys/arch/sun3/conf/FOUR_TTYS
@@ -16,7 +16,7 @@ options 	HAVECACHE		# Sun3/260 VAC
 maxusers	4
 
 # Standard system options
-options 	SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+options 	SWAPPAGER, DEVPAGER		# paging
 options 	KTRACE				# system call tracing support
 #makeoptions DEBUG="-g"			# symbols for kgdb + nm
 options 	DDB
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index abd2b4a0ab4..c74494aaa6e 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -16,7 +16,7 @@ options 	HAVECACHE		# Sun3/260 VAC
 maxusers	4
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+options		SWAPPAGER, DEVPAGER		# paging
 options		KTRACE				# system call tracing support
 #makeoptions	DEBUG="-g"			# symbols for kgdb + nm
 options 	DDB
diff --git a/sys/arch/sun3/conf/RAMDISK b/sys/arch/sun3/conf/RAMDISK
index b026f0969bc..39f5858ef16 100644
--- a/sys/arch/sun3/conf/RAMDISK
+++ b/sys/arch/sun3/conf/RAMDISK
@@ -17,7 +17,7 @@ options 	HAVECACHE		# Sun3/260 VAC
 maxusers	2
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+options		SWAPPAGER			# paging
 #makeoptions	DEBUG="-g"			# symbols for kgdb + nm
 #options 	DDB
 
diff --git a/sys/arch/sun3/conf/SMD_TEST b/sys/arch/sun3/conf/SMD_TEST
index db754dc6434..0c0eefc4fa1 100644
--- a/sys/arch/sun3/conf/SMD_TEST
+++ b/sys/arch/sun3/conf/SMD_TEST
@@ -16,7 +16,7 @@ options 	HAVECACHE		# Sun3/260 VAC
 maxusers	4
 
 # Standard system options
-options		SWAPPAGER, VNODEPAGER, DEVPAGER	# paging
+options		SWAPPAGER			# paging
 options		KTRACE				# system call tracing support
 #makeoptions	DEBUG="-g"			# symbols for kgdb + nm
 options		DDB
diff --git a/sys/arch/vax/conf/EVERYTHING b/sys/arch/vax/conf/EVERYTHING
index 59424270437..101d475b0c9 100644
--- a/sys/arch/vax/conf/EVERYTHING
+++ b/sys/arch/vax/conf/EVERYTHING
@@ -1,4 +1,4 @@
-#	$OpenBSD: EVERYTHING,v 1.3 1996/08/31 02:09:43 deraadt Exp $
+#	$OpenBSD: EVERYTHING,v 1.4 1996/09/20 06:45:26 deraadt Exp $
 #	$NetBSD: EVERYTHING,v 1.1 1995/03/29 22:54:02 ragge Exp $
 #
 # This file contains everything that is known to be compiled
@@ -18,7 +18,7 @@ options         EVERYTHING
 maxusers	16
 
 # Paging system, we always have them all.
-options		SWAPPAGER, DEVPAGER, VNODEPAGER
+options		SWAPPAGER, DEVPAGER
 
 # Kernel compiled-in symbolic debugger
 #options		DDB
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index e319b4dfbab..6a181c456bc 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -19,7 +19,7 @@ options         GENERIC
 maxusers	8
 
 # Paging system, we always have them all.
-options		SWAPPAGER, DEVPAGER, VNODEPAGER
+options		SWAPPAGER, DEVPAGER
 
 # Kernel compiled-in symbolic debugger & system call tracer
 options		DDB
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 49525b2257b..f6c585cce1c 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.10 1996/08/31 01:58:49 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.11 1996/09/20 06:44:45 deraadt Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
@@ -9,7 +9,6 @@ option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight savings time used by RTC
 
 option		SWAPPAGER	# paging; REQUIRED
-option		VNODEPAGER	# mmap() of files
 option		DEVPAGER	# mmap() of devices
 
 option		DDB		# in-kernel debugger
diff --git a/sys/conf/files b/sys/conf/files
index 770544c8361..2934f02090b 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.39 1996/08/30 08:39:19 deraadt Exp $
+#	$OpenBSD: files,v 1.40 1996/09/20 06:44:46 deraadt Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -405,4 +405,4 @@ file vm/vm_pager.c
 file vm/vm_swap.c
 file vm/vm_unix.c
 file vm/vm_user.c
-file vm/vnode_pager.c			vnodepager
+file vm/vnode_pager.c
diff --git a/sys/conf/files.oldconf b/sys/conf/files.oldconf
index ea73d6d84d5..0b306908a30 100644
--- a/sys/conf/files.oldconf
+++ b/sys/conf/files.oldconf
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.oldconf,v 1.13 1996/08/30 08:39:20 deraadt Exp $
+#	$OpenBSD: files.oldconf,v 1.14 1996/09/20 06:44:47 deraadt Exp $
 #	$NetBSD: files.oldconf,v 1.67.4.1 1996/05/29 23:14:10 cgd Exp $
 #
 adosfs/adlookup.c	optional adosfs
@@ -291,7 +291,7 @@ vm/vm_pager.c		standard
 vm/vm_swap.c		standard
 vm/vm_unix.c		standard
 vm/vm_user.c		standard
-vm/vnode_pager.c	optional vnodepager
+vm/vnode_pager.c	standard
 dev/ccd.c		optional ccd needs-count
 # XXX !! This should not be necessary!
 dev/audio.c		optional audio device-driver
diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c
index dbf95c3e984..8adc53ed4b4 100644
--- a/sys/vm/vm_pager.c
+++ b/sys/vm/vm_pager.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_pager.c,v 1.4 1996/08/02 00:06:05 niklas Exp $	*/
+/*	$OpenBSD: vm_pager.c,v 1.5 1996/09/20 06:44:49 deraadt Exp $	*/
 /*	$NetBSD: vm_pager.c,v 1.21 1996/03/16 23:15:25 christos Exp $	*/
 
 /* 
@@ -83,9 +83,7 @@
 extern struct pagerops swappagerops;
 #endif
 
-#ifdef VNODEPAGER
 extern struct pagerops vnodepagerops;
-#endif
 
 #ifdef DEVPAGER
 extern struct pagerops devicepagerops;
@@ -97,11 +95,7 @@ struct pagerops *pagertab[] = {
 #else
 	NULL,
 #endif
-#ifdef VNODEPAGER
 	&vnodepagerops,		/* PG_VNODE */
-#else
-	NULL,
-#endif
 #ifdef DEVPAGER
 	&devicepagerops,	/* PG_DEV */
 #else