Only include PROCFS on kernels which have either COMPAT_LINUX or COMPAT_SVR4,

otherwise it's just a waste of bytes.
ok deraadt@ mickey@

9 files changed, 17 insertions, 10 deletions

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 30404174410..6641d8e2664 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.90 2005/12/09 01:48:21 beck Exp $
+#	$OpenBSD: GENERIC,v 1.91 2005/12/12 20:39:32 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -29,6 +29,7 @@ option		APERTURE	# in-kernel aperture driver for XFree86
 #option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
 #option		COMPAT_BSDOS	# binary compatibility with BSD/OS
 #option		COMPAT_AOUT	# a.out binaries are emulated
+#option		PROCFS		# /proc
 
 #option		NTFS		# Experimental NTFS support
 
diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index 91197000bb0..e4fc3ad7c45 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.79 2005/10/27 02:45:01 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.80 2005/12/12 20:39:35 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -30,6 +30,7 @@ option		USER_PCICONF	# user-space PCI configuration
 
 option		COMPAT_HPUX
 #option		COMPAT_LINUX
+#option		PROCFS		# /proc
 
 option		TIMEZONE=0	# time zone to adjust RTC time by
 option		DST=0		# daylight saving time used by RTC
diff --git a/sys/arch/hppa64/conf/GENERIC b/sys/arch/hppa64/conf/GENERIC
index 2ff2577c31b..64c33997d9f 100644
--- a/sys/arch/hppa64/conf/GENERIC
+++ b/sys/arch/hppa64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.8 2005/08/03 16:30:34 martin Exp $
+#	$OpenBSD: GENERIC,v 1.9 2005/12/12 20:39:35 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -20,6 +20,7 @@ option		DST=0		# daylight saving time used by RTC
 
 #option	COMPAT_HPUX
 #option	COMPAT_LINUX
+#option		PROCFS		# /proc
 
 config	bsd swap generic
 
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 6c970a57cc6..fdefb78824c 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.442 2005/12/07 05:05:12 jordan Exp $
+#	$OpenBSD: GENERIC,v 1.443 2005/12/12 20:39:35 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -37,6 +37,7 @@ option		COMPAT_FREEBSD	# binary compatibility with FreeBSD
 option		COMPAT_BSDOS	# binary compatibility with BSD/OS
 option		COMPAT_AOUT	# a.out binaries are emulated
 
+option		PROCFS		# /proc
 #option		NTFS		# Experimental NTFS support
 
 # or use		root on nfs swap on nfs
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 53ebf350086..b98cd9024db 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.85 2005/08/03 02:10:44 dlg Exp $
+#	$OpenBSD: GENERIC,v 1.86 2005/12/12 20:39:36 miod Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -28,6 +28,7 @@ option		SUN4M		# sun4m - SS10, SS20, Classic, etc.
 # Options for SPARCstation hardware
 option		COMPAT_SUNOS	# compatibility with SunOS binaries
 option		COMPAT_SVR4	# compatibility with SVR4 binaries
+option		PROCFS		# /proc
 
 # Generic swap; second partition of root disk or network.
 config		bsd	swap generic
diff --git a/sys/arch/sparc/conf/SUN4 b/sys/arch/sparc/conf/SUN4
index 92f7592a847..cdacd9d0e82 100644
--- a/sys/arch/sparc/conf/SUN4
+++ b/sys/arch/sparc/conf/SUN4
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4,v 1.31 2005/05/01 07:54:42 david Exp $
+#	$OpenBSD: SUN4,v 1.32 2005/12/12 20:39:36 miod Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -13,6 +13,7 @@ option		SUN4		# sun4/100, sun4/200, sun4/300
 # Options for SPARCstation hardware
 option		COMPAT_SUNOS	# compatibility with SunOS binaries
 option		COMPAT_SVR4	# compatibility with SVR4 binaries
+option		PROCFS		# /proc
 
 maxusers	16		# estimated number of users
 
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 7989278104b..1f4c14b4582 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4C,v 1.53 2005/07/08 12:36:36 miod Exp $
+#	$OpenBSD: SUN4C,v 1.54 2005/12/12 20:39:36 miod Exp $
 #	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -16,6 +16,7 @@ option		SUN4C		# sun4c - SS1, 1+, 2, ELC, SLC, IPC, IPX, etc.
 # Options for SPARCstation hardware
 option		COMPAT_SUNOS	# compatibility with SunOS binaries
 option		COMPAT_SVR4	# compatibility with SVR4 binaries
+option		PROCFS		# /proc
 
 maxusers	18		# estimated number of users
 
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index 943c6110563..1cac8ec210b 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.69 2005/07/17 12:21:25 miod Exp $
+#	$OpenBSD: SUN4M,v 1.70 2005/12/12 20:39:36 miod Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -18,6 +18,7 @@ option		SUN4M		# sun4m - SS10, SS20, Classic, etc.
 # Options for SPARCstation hardware
 option		COMPAT_SUNOS	# compatibility with SunOS binaries
 option		COMPAT_SVR4	# compatibility with SVR4 binaries
+option		PROCFS		# /proc
 
 maxusers	32		# estimated number of users
 
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index b2a823a6191..78fc48a321d 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.122 2005/12/06 20:18:57 pedro Exp $
+#	$OpenBSD: GENERIC,v 1.123 2005/12/12 20:39:36 miod Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
@@ -54,7 +54,6 @@ option		UDF		# UDF (DVD) file system
 option		MSDOSFS		# MS-DOS file system
 option		FIFO		# FIFOs; RECOMMENDED
 option		PORTAL		# dynamically created filesystem objects
-option		PROCFS		# /proc
 
 option		INET		# IP + ICMP + TCP + UDP
 option		ALTQ		# ALTQ base