diff --git a/sys/arch/acorn32/conf/EB7500ATX b/sys/arch/acorn32/conf/EB7500ATX
index 3282b0c14ceb..482a535e3bb6 100644
--- a/sys/arch/acorn32/conf/EB7500ATX
+++ b/sys/arch/acorn32/conf/EB7500ATX
@@ -1,4 +1,4 @@
-#	$NetBSD: EB7500ATX,v 1.18 2005/07/31 04:04:30 yamt Exp $
+#	$NetBSD: EB7500ATX,v 1.19 2005/08/19 02:03:49 christos Exp $
 #
 #	EB7500ATX --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"EB7500ATX-$Revision: 1.18 $"
+#ident		"EB7500ATX-$Revision: 1.19 $"
 
 # estimated number of users
 maxusers	32
@@ -106,6 +106,7 @@ options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
 # Compatibility options
 
 options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options		COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/acorn32/conf/GENERIC b/sys/arch/acorn32/conf/GENERIC
index 9df66989133d..d1d8ebb1cce4 100644
--- a/sys/arch/acorn32/conf/GENERIC
+++ b/sys/arch/acorn32/conf/GENERIC
@@ -1,4 +1,4 @@
-# 	$NetBSD: GENERIC,v 1.58 2005/07/31 04:04:30 yamt Exp $
+# 	$NetBSD: GENERIC,v 1.59 2005/08/19 02:03:49 christos Exp $
 #
 #	GENERIC --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.58 $"
+#ident		"GENERIC-$Revision: 1.59 $"
 
 # estimated number of users
 maxusers	32
@@ -113,6 +113,7 @@ options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
 # Compatibility options
 
 options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options		COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options		COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/acorn32/conf/INSTALL b/sys/arch/acorn32/conf/INSTALL
index 6b283b30c8fa..22538cb211ac 100644
--- a/sys/arch/acorn32/conf/INSTALL
+++ b/sys/arch/acorn32/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.32 2005/07/07 17:05:46 tron Exp $
+#	$NetBSD: INSTALL,v 1.33 2005/08/19 02:03:49 christos Exp $
 #
 #	INSTALL -- NetBSD/acorn32 install configuration
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"INSTALL-$Revision: 1.32 $"
+#ident		"INSTALL-$Revision: 1.33 $"
 
 # estimated number of users
 maxusers	32
@@ -100,6 +100,7 @@ options 	INET		# IP + ICMP + TCP + UDP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options		COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/acorn32/conf/LOWMEM_WSCONS b/sys/arch/acorn32/conf/LOWMEM_WSCONS
index a4c9520971c4..629405c3eea8 100644
--- a/sys/arch/acorn32/conf/LOWMEM_WSCONS
+++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: LOWMEM_WSCONS,v 1.34 2005/07/31 04:04:30 yamt Exp $
+#	$NetBSD: LOWMEM_WSCONS,v 1.35 2005/08/19 02:03:49 christos Exp $
 #
 #	LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines
 #
@@ -83,6 +83,7 @@ options 	INET		# IP + ICMP + TCP + UDP
 # Compatibility options
 
 options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_14	# NetBSD 1.4 compatibility.
diff --git a/sys/arch/acorn32/conf/NC b/sys/arch/acorn32/conf/NC
index 6fd303bd40ab..2fd04fb50c1b 100644
--- a/sys/arch/acorn32/conf/NC
+++ b/sys/arch/acorn32/conf/NC
@@ -1,4 +1,4 @@
-#	$NetBSD: NC,v 1.33 2005/07/31 04:04:30 yamt Exp $
+#	$NetBSD: NC,v 1.34 2005/08/19 02:03:49 christos Exp $
 #
 #	NC - with vidcconsole
 #
@@ -79,6 +79,7 @@ options 	INET		# IP + ICMP + TCP + UDP
 # Compatibility options
 
 options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_14	# NetBSD 1.4 compatibility.
diff --git a/sys/arch/acorn32/conf/NC_WSCONS b/sys/arch/acorn32/conf/NC_WSCONS
index e970efa47c8d..46402b73109d 100644
--- a/sys/arch/acorn32/conf/NC_WSCONS
+++ b/sys/arch/acorn32/conf/NC_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: NC_WSCONS,v 1.39 2005/07/31 04:04:30 yamt Exp $
+#	$NetBSD: NC_WSCONS,v 1.40 2005/08/19 02:03:49 christos Exp $
 #
 #	NC - with wscons
 #
@@ -81,6 +81,7 @@ options 	INET		# IP + ICMP + TCP + UDP
 # Compatibility options
 
 options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options		COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/acorn32/conf/RPC_WSCONS b/sys/arch/acorn32/conf/RPC_WSCONS
index 609337f619d5..bb3061d771a1 100644
--- a/sys/arch/acorn32/conf/RPC_WSCONS
+++ b/sys/arch/acorn32/conf/RPC_WSCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: RPC_WSCONS,v 1.39 2005/07/31 04:04:30 yamt Exp $
+#	$NetBSD: RPC_WSCONS,v 1.40 2005/08/19 02:03:49 christos Exp $
 #
 #	RPC_WSCONS -- Full RiscPC config with wscons
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.39 $"
+#ident		"GENERIC-$Revision: 1.40 $"
 
 # estimated number of users
 maxusers	32
@@ -98,6 +98,7 @@ options 	INET6		# IPV6
 # Compatibility options
 
 options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options		COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_14	# NetBSD 1.4 compatibility.
diff --git a/sys/arch/algor/conf/P4032 b/sys/arch/algor/conf/P4032
index 82ca8c3a4876..cc9f2230507b 100644
--- a/sys/arch/algor/conf/P4032
+++ b/sys/arch/algor/conf/P4032
@@ -1,4 +1,4 @@
-#	$NetBSD: P4032,v 1.35 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: P4032,v 1.36 2005/08/19 02:03:49 christos Exp $
 #
 # Algorithmics P-4032 kernel.
 #
@@ -7,7 +7,7 @@ include	"arch/algor/conf/std.algor"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P4032-$Revision: 1.35 $"
+#ident 		"P4032-$Revision: 1.36 $"
 
 maxusers 32
 
@@ -68,6 +68,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 # System V-like message queues
diff --git a/sys/arch/algor/conf/P5064 b/sys/arch/algor/conf/P5064
index 5a625bf67a39..24733571dc1e 100644
--- a/sys/arch/algor/conf/P5064
+++ b/sys/arch/algor/conf/P5064
@@ -1,4 +1,4 @@
-#	$NetBSD: P5064,v 1.41 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: P5064,v 1.42 2005/08/19 02:03:49 christos Exp $
 #
 # Algorithmics P-5064 kernel.
 #
@@ -7,7 +7,7 @@ include	"arch/algor/conf/std.algor"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P5064-$Revision: 1.41 $"
+#ident 		"P5064-$Revision: 1.42 $"
 
 maxusers 32
 
@@ -63,6 +63,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 # System V-like message queues
diff --git a/sys/arch/algor/conf/P6032 b/sys/arch/algor/conf/P6032
index b5a82de3ff79..d5410ae1a9f8 100644
--- a/sys/arch/algor/conf/P6032
+++ b/sys/arch/algor/conf/P6032
@@ -1,4 +1,4 @@
-#	$NetBSD: P6032,v 1.35 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: P6032,v 1.36 2005/08/19 02:03:49 christos Exp $
 #
 # Algorithmics P-6032 kernel.
 #
@@ -7,7 +7,7 @@ include	"arch/algor/conf/std.algor"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"P6032-$Revision: 1.35 $"
+#ident 		"P6032-$Revision: 1.36 $"
 
 maxusers 32
 
@@ -63,6 +63,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 # System V-like message queues
diff --git a/sys/arch/alpha/conf/ALPHA b/sys/arch/alpha/conf/ALPHA
index a03f0c74b882..cf6eda3e11ea 100644
--- a/sys/arch/alpha/conf/ALPHA
+++ b/sys/arch/alpha/conf/ALPHA
@@ -1,4 +1,4 @@
-# $NetBSD: ALPHA,v 1.210 2005/08/05 09:23:16 skrll Exp $
+# $NetBSD: ALPHA,v 1.211 2005/08/19 02:03:49 christos Exp $
 #
 # Alpha kernel with all the options you'd want, and more.
 
@@ -6,7 +6,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"ALPHA-$Revision: 1.210 $"
+ident		"ALPHA-$Revision: 1.211 $"
 
 maxusers 32
 
@@ -116,6 +116,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 
 # OSF/1 binary compatibility
 options 	COMPAT_OSF1
diff --git a/sys/arch/alpha/conf/BASIL b/sys/arch/alpha/conf/BASIL
index 3f5d2780a213..dc0229f7d534 100644
--- a/sys/arch/alpha/conf/BASIL
+++ b/sys/arch/alpha/conf/BASIL
@@ -1,4 +1,4 @@
-# $NetBSD: BASIL,v 1.39 2005/08/05 09:23:16 skrll Exp $
+# $NetBSD: BASIL,v 1.40 2005/08/19 02:03:49 christos Exp $
 #
 # basil.shagadelic.org -- thorpej's API UP1000
 
@@ -6,7 +6,7 @@ include	"arch/alpha/conf/std.alpha"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"BASIL-$Revision: 1.39 $"
+#ident 		"BASIL-$Revision: 1.40 $"
 
 maxusers 64
 
@@ -77,6 +77,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 
 # OSF/1 binary compatibility
 options 	COMPAT_OSF1
diff --git a/sys/arch/alpha/conf/FRAU-FARBISSINA b/sys/arch/alpha/conf/FRAU-FARBISSINA
index bb3d5c2ed96b..f5fd9077c121 100644
--- a/sys/arch/alpha/conf/FRAU-FARBISSINA
+++ b/sys/arch/alpha/conf/FRAU-FARBISSINA
@@ -1,4 +1,4 @@
-# $NetBSD: FRAU-FARBISSINA,v 1.44 2005/08/05 09:23:16 skrll Exp $
+# $NetBSD: FRAU-FARBISSINA,v 1.45 2005/08/19 02:03:49 christos Exp $
 #
 # frau-farbissina.shagadelic.org -- thorpej's AlphaServer 1200 MP hacking
 # box
@@ -7,7 +7,7 @@ include	"arch/alpha/conf/std.alpha"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"FRAU-FARBISSINA-$Revision: 1.44 $"
+#ident 		"FRAU-FARBISSINA-$Revision: 1.45 $"
 
 maxusers 64
 
@@ -77,6 +77,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 
 # OSF/1 binary compatibility
 options 	COMPAT_OSF1
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 62397deb5206..f60d3318fe5c 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -22,7 +22,7 @@ include		"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.272 $"
+#ident 		"GENERIC-$Revision: 1.273 $"
 
 maxusers 32
 
@@ -137,6 +137,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options		COMPAT_16
 options		COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 # OSF/1 binary compatibility
 options 	COMPAT_OSF1
 
diff --git a/sys/arch/alpha/conf/RAWHIDE b/sys/arch/alpha/conf/RAWHIDE
index b7a0a4324269..3f25f04e9690 100644
--- a/sys/arch/alpha/conf/RAWHIDE
+++ b/sys/arch/alpha/conf/RAWHIDE
@@ -1,4 +1,4 @@
-# $NetBSD: RAWHIDE,v 1.24 2005/02/25 13:46:48 simonb Exp $
+# $NetBSD: RAWHIDE,v 1.25 2005/08/19 02:03:49 christos Exp $
 #
 # Alpha 4100 stripped for action server kernel.
 #
@@ -39,6 +39,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 options 	SYSVMSG
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index b340cfb92314..813b3f050253 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.64 2005/08/05 09:23:16 skrll Exp $
+# $NetBSD: GENERIC,v 1.65 2005/08/19 02:03:49 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.64 $"
+#ident 		"GENERIC-$Revision: 1.65 $"
 
 maxusers	32		# estimated number of users
 
@@ -95,6 +95,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 options 	COMPAT_15	# compatibility with NetBSD 1.5,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
diff --git a/sys/arch/amd64/conf/SIMICS b/sys/arch/amd64/conf/SIMICS
index 425d4a0e60b6..604da83d858e 100644
--- a/sys/arch/amd64/conf/SIMICS
+++ b/sys/arch/amd64/conf/SIMICS
@@ -1,4 +1,4 @@
-#	$NetBSD: SIMICS,v 1.20 2005/07/31 04:04:30 yamt Exp $
+#	$NetBSD: SIMICS,v 1.21 2005/08/19 02:03:49 christos Exp $
 #
 #	INSTALL_TINY - Tiny Installation kernel, suitable for 4M machines.
 #
@@ -71,6 +71,7 @@ options 	USERCONF	# userconf(4) support
 #options 	COMPAT_14	# NetBSD 1.4,
 #options 	COMPAT_16	# NetBSD 1.6,
 #options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
diff --git a/sys/arch/amiga/conf/AMIGA b/sys/arch/amiga/conf/AMIGA
index b1db389a3fa8..b36207397ce0 100644
--- a/sys/arch/amiga/conf/AMIGA
+++ b/sys/arch/amiga/conf/AMIGA
@@ -1,4 +1,4 @@
-# $NetBSD: AMIGA,v 1.85 2005/07/31 04:05:45 yamt Exp $
+# $NetBSD: AMIGA,v 1.86 2005/08/19 02:03:49 christos Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -28,7 +28,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.85 $"
+#ident 		"GENERIC-$Revision: 1.86 $"
 
 
 maxusers	8
@@ -148,6 +148,7 @@ options 	COMPAT_14	# compatibility with NetBSD 1.4
 options 	COMPAT_15	# compatibility with NetBSD 1.5
 options 	COMPAT_16	# compatibility with NetBSD 1.6
 options 	COMPAT_20	# compatibility with NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# Support to run Sun (m68k) executables
 options 	COMPAT_SVR4	# Support to run SVR4 (m68k) executables
 options 	COMPAT_NOMID	# allow nonvalid machine id executables
diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO
index a063cfda1887..3c4fb6ad25fb 100644
--- a/sys/arch/amiga/conf/DRACO
+++ b/sys/arch/amiga/conf/DRACO
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.101 2005/07/31 04:05:45 yamt Exp $
+# $NetBSD: DRACO,v 1.102 2005/08/19 02:03:49 christos Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -28,7 +28,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.101 $"
+#ident 		"GENERIC-$Revision: 1.102 $"
 
 
 maxusers	8
@@ -137,6 +137,7 @@ options 	COMPAT_14	# compatibility with NetBSD 1.4
 options 	COMPAT_15	# compatibility with NetBSD 1.5
 options 	COMPAT_16	# compatibility with NetBSD 1.6
 options 	COMPAT_20	# compatibility with NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# Support to run Sun (m68k) executables
 options 	COMPAT_SVR4	# Support to run SVR4 (m68k) executables
 options 	COMPAT_NOMID	# allow nonvalid machine id executables
diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC
index 48e2c12a532d..3caf9f3b0b39 100644
--- a/sys/arch/amiga/conf/GENERIC
+++ b/sys/arch/amiga/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.223 2005/07/31 04:05:45 yamt Exp $
+# $NetBSD: GENERIC,v 1.224 2005/08/19 02:03:49 christos Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -28,7 +28,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.223 $"
+#ident 		"GENERIC-$Revision: 1.224 $"
 
 
 maxusers	8
@@ -149,6 +149,7 @@ options 	COMPAT_14	# compatibility with NetBSD 1.4
 options 	COMPAT_15	# compatibility with NetBSD 1.5
 options 	COMPAT_16	# compatibility with NetBSD 1.6
 options 	COMPAT_20	# compatibility with NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# Support to run Sun (m68k) executables
 options 	COMPAT_SVR4	# Support to run SVR4 (m68k) executables
 options 	COMPAT_NOMID	# allow nonvalid machine id executables
diff --git a/sys/arch/amiga/conf/GENERIC.in b/sys/arch/amiga/conf/GENERIC.in
index f3fbbc9c55d8..105dafce45ee 100644
--- a/sys/arch/amiga/conf/GENERIC.in
+++ b/sys/arch/amiga/conf/GENERIC.in
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.41 2005/07/31 04:04:31 yamt Exp $
+# $NetBSD: GENERIC.in,v 1.42 2005/08/19 02:03:49 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -56,7 +56,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.41 $"
+#ident 		"GENERIC-$Revision: 1.42 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions	COPTS="-Os"
@@ -197,6 +197,7 @@ options 	COMPAT_14	# compatibility with NetBSD 1.4
 options 	COMPAT_15	# compatibility with NetBSD 1.5
 options 	COMPAT_16	# compatibility with NetBSD 1.6
 options 	COMPAT_20	# compatibility with NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# Support to run Sun (m68k) executables
 options 	COMPAT_SVR4	# Support to run SVR4 (m68k) executables
 options 	COMPAT_NOMID	# allow nonvalid machine id executables
diff --git a/sys/arch/amiga/conf/WSCONS b/sys/arch/amiga/conf/WSCONS
index 25b7ae179e96..d5998d9ea2a7 100644
--- a/sys/arch/amiga/conf/WSCONS
+++ b/sys/arch/amiga/conf/WSCONS
@@ -1,4 +1,4 @@
-# $NetBSD: WSCONS,v 1.39 2005/07/31 04:05:45 yamt Exp $
+# $NetBSD: WSCONS,v 1.40 2005/08/19 02:03:49 christos Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -28,7 +28,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.39 $"
+#ident 		"GENERIC-$Revision: 1.40 $"
 
 
 maxusers	8
@@ -149,6 +149,7 @@ options 	COMPAT_14	# compatibility with NetBSD 1.4
 options 	COMPAT_15	# compatibility with NetBSD 1.5
 options 	COMPAT_16	# compatibility with NetBSD 1.6
 options 	COMPAT_20	# compatibility with NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# Support to run Sun (m68k) executables
 options 	COMPAT_SVR4	# Support to run SVR4 (m68k) executables
 options 	COMPAT_NOMID	# allow nonvalid machine id executables
diff --git a/sys/arch/arc/conf/ARCTIC b/sys/arch/arc/conf/ARCTIC
index 157eaae58e06..65fd71e34076 100644
--- a/sys/arch/arc/conf/ARCTIC
+++ b/sys/arch/arc/conf/ARCTIC
@@ -1,4 +1,4 @@
-#	$NetBSD: ARCTIC,v 1.36 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: ARCTIC,v 1.37 2005/08/19 02:03:49 christos Exp $
 #	$OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $
 #
 #	configuration file for DeskStation
@@ -56,6 +56,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC
index d6f00fc342a4..b12badeb371c 100644
--- a/sys/arch/arc/conf/GENERIC
+++ b/sys/arch/arc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.120 2005/07/31 04:04:31 yamt Exp $
+# $NetBSD: GENERIC,v 1.121 2005/08/19 02:03:49 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/arc/conf/std.arc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.120 $"
+#ident		"GENERIC-$Revision: 1.121 $"
 
 maxusers	32		# estimated number of users
 
@@ -89,6 +89,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/arc/conf/M403 b/sys/arch/arc/conf/M403
index c0f41b9a6f4f..2ad936eb255f 100644
--- a/sys/arch/arc/conf/M403
+++ b/sys/arch/arc/conf/M403
@@ -1,4 +1,4 @@
-#	$NetBSD: M403,v 1.33 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: M403,v 1.34 2005/08/19 02:03:49 christos Exp $
 #
 #	configuration file for MIPS Magnum 4000 system
 #
@@ -49,6 +49,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
diff --git a/sys/arch/arc/conf/MIMORI b/sys/arch/arc/conf/MIMORI
index ee9cbacfee7e..140a4a62661a 100644
--- a/sys/arch/arc/conf/MIMORI
+++ b/sys/arch/arc/conf/MIMORI
@@ -1,4 +1,4 @@
-#	$NetBSD: MIMORI,v 1.38 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: MIMORI,v 1.39 2005/08/19 02:03:49 christos Exp $
 #	NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp
 #
 #	MIMORI -- My NEC RISCstation 2250 (ur)
@@ -51,6 +51,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
diff --git a/sys/arch/arc/conf/PCCONS b/sys/arch/arc/conf/PCCONS
index 4754d5821d04..f275754ed315 100644
--- a/sys/arch/arc/conf/PCCONS
+++ b/sys/arch/arc/conf/PCCONS
@@ -1,4 +1,4 @@
-#	$NetBSD: PCCONS,v 1.46 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: PCCONS,v 1.47 2005/08/19 02:03:49 christos Exp $
 #	$OpenBSD: GENERIC,v 1.29 1999/08/29 12:14:03 niklas Exp $
 #
 #	PCCONS -- generic but pccons rather than wscons
@@ -60,6 +60,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
diff --git a/sys/arch/arc/conf/PICA b/sys/arch/arc/conf/PICA
index 7928d9565e6d..283292985724 100644
--- a/sys/arch/arc/conf/PICA
+++ b/sys/arch/arc/conf/PICA
@@ -1,4 +1,4 @@
-#	$NetBSD: PICA,v 1.49 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: PICA,v 1.50 2005/08/19 02:03:49 christos Exp $
 #
 #	configuration file for ACER PICA system
 #
@@ -50,6 +50,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
diff --git a/sys/arch/arc/conf/RAMDISK b/sys/arch/arc/conf/RAMDISK
index c7822d9c4ad1..fa1e1844b491 100644
--- a/sys/arch/arc/conf/RAMDISK
+++ b/sys/arch/arc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$NetBSD: RAMDISK,v 1.61 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: RAMDISK,v 1.62 2005/08/19 02:03:49 christos Exp $
 #
 #	memory disk based configuration file for MIPS R4x00 ARC Systems
 #
@@ -7,7 +7,7 @@ include		"arch/arc/conf/std.arc"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.61 $"
+#ident		"GENERIC-$Revision: 1.62 $"
 
 maxusers	32		# estimated number of users
 
@@ -73,6 +73,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
diff --git a/sys/arch/arc/conf/RPC44 b/sys/arch/arc/conf/RPC44
index 53e474034343..bf4d05c6fc50 100644
--- a/sys/arch/arc/conf/RPC44
+++ b/sys/arch/arc/conf/RPC44
@@ -1,4 +1,4 @@
-# $NetBSD: RPC44,v 1.18 2005/07/31 04:04:31 yamt Exp $
+# $NetBSD: RPC44,v 1.19 2005/08/19 02:03:49 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/arc/conf/std.arc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.18 $"
+#ident		"GENERIC-$Revision: 1.19 $"
 
 maxusers	32		# estimated number of users
 
@@ -77,6 +77,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 
diff --git a/sys/arch/atari/conf/ATARITT b/sys/arch/atari/conf/ATARITT
index 7bc159a50161..931fc189c6f3 100644
--- a/sys/arch/atari/conf/ATARITT
+++ b/sys/arch/atari/conf/ATARITT
@@ -1,5 +1,5 @@
 #
-# $NetBSD: ATARITT,v 1.71 2005/07/31 04:05:25 yamt Exp $
+# $NetBSD: ATARITT,v 1.72 2005/08/19 02:03:49 christos Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -76,6 +76,7 @@ options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
+options COMPAT_30	# NetBSD 3.0 compatibility.
 
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
diff --git a/sys/arch/atari/conf/BOOT b/sys/arch/atari/conf/BOOT
index ce0270dbae6a..3d90b5e4b418 100644
--- a/sys/arch/atari/conf/BOOT
+++ b/sys/arch/atari/conf/BOOT
@@ -1,5 +1,5 @@
 #
-# $NetBSD: BOOT,v 1.64 2005/07/31 04:05:25 yamt Exp $
+# $NetBSD: BOOT,v 1.65 2005/08/19 02:03:49 christos Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -38,6 +38,7 @@ options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
+options COMPAT_30	# NetBSD 3.0 compatibility.
 
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
diff --git a/sys/arch/atari/conf/BOOTX b/sys/arch/atari/conf/BOOTX
index ab5ce481f7ae..f87989a003df 100644
--- a/sys/arch/atari/conf/BOOTX
+++ b/sys/arch/atari/conf/BOOTX
@@ -1,5 +1,5 @@
 #
-# $NetBSD: BOOTX,v 1.59 2005/07/31 04:05:25 yamt Exp $
+# $NetBSD: BOOTX,v 1.60 2005/08/19 02:03:49 christos Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -38,6 +38,7 @@ options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
+options COMPAT_30	# NetBSD 3.0 compatibility.
 
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
diff --git a/sys/arch/atari/conf/FALCON b/sys/arch/atari/conf/FALCON
index b4153c4e1487..83d10881cb7c 100644
--- a/sys/arch/atari/conf/FALCON
+++ b/sys/arch/atari/conf/FALCON
@@ -1,5 +1,5 @@
 #
-# $NetBSD: FALCON,v 1.69 2005/07/31 04:05:26 yamt Exp $
+# $NetBSD: FALCON,v 1.70 2005/08/19 02:03:49 christos Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -74,6 +74,7 @@ options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
+options COMPAT_30	# NetBSD 3.0 compatibility.
 
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
diff --git a/sys/arch/atari/conf/GENERIC.in b/sys/arch/atari/conf/GENERIC.in
index 48a2e52932c8..81dcd5fabb2b 100644
--- a/sys/arch/atari/conf/GENERIC.in
+++ b/sys/arch/atari/conf/GENERIC.in
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.in,v 1.53 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: GENERIC.in,v 1.54 2005/08/19 02:03:49 christos Exp $
 #
 # Generic atari
 #
@@ -151,6 +151,7 @@ options 	COMPAT_14	# Compatibility with NetBSD 1.4
 options 	COMPAT_15	# Compatibility with NetBSD 1.5
 options 	COMPAT_16	# Compatibility with NetBSD 1.6
 options 	COMPAT_20	# Compatibility with NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #ifndef INSTALL_KERNEL
 #options 	COMPAT_09	# has no meaning on the atari
 #options 	COMPAT_SUNOS	# Support to run Sun-3 executables
diff --git a/sys/arch/atari/conf/HADES b/sys/arch/atari/conf/HADES
index 56e386591982..8aa4dacd7ec3 100644
--- a/sys/arch/atari/conf/HADES
+++ b/sys/arch/atari/conf/HADES
@@ -1,5 +1,5 @@
 #
-# $NetBSD: HADES,v 1.61 2005/07/31 04:05:26 yamt Exp $
+# $NetBSD: HADES,v 1.62 2005/08/19 02:03:49 christos Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -76,6 +76,7 @@ options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
+options COMPAT_30	# NetBSD 3.0 compatibility.
 
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
diff --git a/sys/arch/atari/conf/MILAN-ISAIDE b/sys/arch/atari/conf/MILAN-ISAIDE
index ed2dd76d496c..2268fe80640c 100644
--- a/sys/arch/atari/conf/MILAN-ISAIDE
+++ b/sys/arch/atari/conf/MILAN-ISAIDE
@@ -1,5 +1,5 @@
 #
-# $NetBSD: MILAN-ISAIDE,v 1.37 2005/07/31 04:05:26 yamt Exp $
+# $NetBSD: MILAN-ISAIDE,v 1.38 2005/08/19 02:03:49 christos Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -76,6 +76,7 @@ options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
+options COMPAT_30	# NetBSD 3.0 compatibility.
 
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
diff --git a/sys/arch/atari/conf/MILAN-PCIIDE b/sys/arch/atari/conf/MILAN-PCIIDE
index aaeea5d53ed8..69cc7e285502 100644
--- a/sys/arch/atari/conf/MILAN-PCIIDE
+++ b/sys/arch/atari/conf/MILAN-PCIIDE
@@ -1,5 +1,5 @@
 #
-# $NetBSD: MILAN-PCIIDE,v 1.41 2005/07/31 04:05:26 yamt Exp $
+# $NetBSD: MILAN-PCIIDE,v 1.42 2005/08/19 02:03:49 christos Exp $
 #
 # This file was automatically created. Changes will be
 # lost when running makeconf in this directory.
@@ -76,6 +76,7 @@ options COMPAT_14 # Compatibility with NetBSD 1.4
 options COMPAT_15 # Compatibility with NetBSD 1.5
 options COMPAT_16 # Compatibility with NetBSD 1.6
 options COMPAT_20 # Compatibility with NetBSD 2.0
+options COMPAT_30	# NetBSD 3.0 compatibility.
 
 options COMPAT_AOUT_M68K # Compatibility to a.out executables
 options EXEC_AOUT # a.out format executables
diff --git a/sys/arch/bebox/conf/GENERIC b/sys/arch/bebox/conf/GENERIC
index 75a17b8f6a02..e4f695e171c7 100644
--- a/sys/arch/bebox/conf/GENERIC
+++ b/sys/arch/bebox/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.85 2005/07/17 00:08:28 hubertf Exp $
+# $NetBSD: GENERIC,v 1.86 2005/08/19 02:03:49 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/bebox/conf/std.bebox"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.85 $"
+#ident 		"GENERIC-$Revision: 1.86 $"
 
 maxusers	32
 
@@ -58,6 +58,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_386BSD_MBRPART	# recognize old partition ID
 #options 	COMPAT_LINUX		# Linux binary compatibility
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/bebox/conf/INSTALL b/sys/arch/bebox/conf/INSTALL
index edf3c0f915a7..eb52120ae9e2 100644
--- a/sys/arch/bebox/conf/INSTALL
+++ b/sys/arch/bebox/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.31 2005/02/25 13:46:48 simonb Exp $
+#	$NetBSD: INSTALL,v 1.32 2005/08/19 02:03:49 christos Exp $
 #
 # First try for BEBOX config file
 #
@@ -44,6 +44,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_386BSD_MBRPART	# recognize old partition ID
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC
index 7427d665ea24..0f0e36d91bb5 100644
--- a/sys/arch/cats/conf/GENERIC
+++ b/sys/arch/cats/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.88 2005/08/05 09:23:16 skrll Exp $
+# $NetBSD: GENERIC,v 1.89 2005/08/19 02:03:49 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -126,6 +126,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_14	# NetBSD 1.4 compatibility.
diff --git a/sys/arch/cats/conf/INSTALL b/sys/arch/cats/conf/INSTALL
index 529bb5f7d04b..81bf1cc3e71e 100644
--- a/sys/arch/cats/conf/INSTALL
+++ b/sys/arch/cats/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.51 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: INSTALL,v 1.52 2005/08/19 02:03:49 christos Exp $
 #
 #	CATSINST -- CHALTECH CATS Install kernel
 #
@@ -86,6 +86,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_14	# NetBSD 1.4 compatibility.
diff --git a/sys/arch/cesfic/conf/GENERIC b/sys/arch/cesfic/conf/GENERIC
index 31287e2c1c91..38fc6b5e3e84 100644
--- a/sys/arch/cesfic/conf/GENERIC
+++ b/sys/arch/cesfic/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.34 2005/07/31 04:04:31 yamt Exp $
+# $NetBSD: GENERIC,v 1.35 2005/08/19 02:03:49 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -51,6 +51,7 @@ options 	COMPAT_14	# compatibility with NetBSD 1.4
 options 	COMPAT_15	# compatibility with NetBSD 1.5
 options 	COMPAT_16	# compatibility with NetBSD 1.6
 options 	COMPAT_20	# compatibility with NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	SYSVSHM		# System V-style shared memory
 #options 	SYSVSEM		# System V-style semaphores
 #options 	SEMMNI=10	# number of semaphore identifiers
diff --git a/sys/arch/cobalt/conf/GENERIC b/sys/arch/cobalt/conf/GENERIC
index ebcbc85d157c..0a2ac1c6f5f9 100644
--- a/sys/arch/cobalt/conf/GENERIC
+++ b/sys/arch/cobalt/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.79 2005/07/31 04:04:31 yamt Exp $
+# $NetBSD: GENERIC,v 1.80 2005/08/19 02:03:49 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.79 $"
+#ident 		"GENERIC-$Revision: 1.80 $"
 
 maxusers	32
 
@@ -67,6 +67,7 @@ options 	COMPAT_43	# compatibility with 4.3BSD binaries
 #options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	EXEC_ECOFF	# exec ECOFF binaries
 #options 	COMPAT_ULTRIX	# binary compatibility with Ultrix
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/cobalt/conf/INSTALL b/sys/arch/cobalt/conf/INSTALL
index 0581785f5d9d..30c978b6a3e8 100644
--- a/sys/arch/cobalt/conf/INSTALL
+++ b/sys/arch/cobalt/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.8 2005/07/07 17:05:47 tron Exp $
+# $NetBSD: INSTALL,v 1.9 2005/08/19 02:03:51 christos Exp $
 #
 # INSTALL -- installation and rescue kernel.
 #
@@ -10,7 +10,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.8 $"
+#ident 		"GENERIC-$Revision: 1.9 $"
 
 makeoptions     COPTS="-Os"
 
@@ -57,6 +57,7 @@ options 	COMPAT_43	# compatibility with 4.3BSD binaries
 #options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	EXEC_ECOFF	# exec ECOFF binaries
 #options 	COMPAT_ULTRIX	# binary compatibility with Ultrix
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/dreamcast/conf/GENERIC b/sys/arch/dreamcast/conf/GENERIC
index 6d441811bb26..f4cf1f5faec5 100644
--- a/sys/arch/dreamcast/conf/GENERIC
+++ b/sys/arch/dreamcast/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.58 2005/07/31 04:04:31 yamt Exp $
+# $NetBSD: GENERIC,v 1.59 2005/08/19 02:03:51 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -64,6 +64,7 @@ options 	SYMTAB_SPACE=220000
 # Compatibility options
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/evbarm/conf/ADI_BRH b/sys/arch/evbarm/conf/ADI_BRH
index aa5ec4f57747..884d002164f9 100644
--- a/sys/arch/evbarm/conf/ADI_BRH
+++ b/sys/arch/evbarm/conf/ADI_BRH
@@ -1,4 +1,4 @@
-#	$NetBSD: ADI_BRH,v 1.29 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: ADI_BRH,v 1.30 2005/08/19 02:03:51 christos Exp $
 #
 #	ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board
 #
@@ -81,6 +81,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/INTEGRATOR b/sys/arch/evbarm/conf/INTEGRATOR
index 7dccd29bb036..b19fda4b0d7c 100644
--- a/sys/arch/evbarm/conf/INTEGRATOR
+++ b/sys/arch/evbarm/conf/INTEGRATOR
@@ -1,4 +1,4 @@
-#	$NetBSD: INTEGRATOR,v 1.41 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: INTEGRATOR,v 1.42 2005/08/19 02:03:51 christos Exp $
 #
 #	GENERIC -- ARM Integrator board Generic kernel
 #
@@ -86,6 +86,7 @@ options 	NFS_BOOT_BOOTPARAM
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/IQ31244 b/sys/arch/evbarm/conf/IQ31244
index 336649190ed6..f2ef11699a15 100644
--- a/sys/arch/evbarm/conf/IQ31244
+++ b/sys/arch/evbarm/conf/IQ31244
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ31244,v 1.31 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: IQ31244,v 1.32 2005/08/19 02:03:51 christos Exp $
 #
 #	IQ31244 -- Intel IQ31244 Evaluation Board Kernel
 #
@@ -81,6 +81,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/IQ80310 b/sys/arch/evbarm/conf/IQ80310
index 406258402df7..73e095751cc1 100644
--- a/sys/arch/evbarm/conf/IQ80310
+++ b/sys/arch/evbarm/conf/IQ80310
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80310,v 1.47 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: IQ80310,v 1.48 2005/08/19 02:03:51 christos Exp $
 #
 #	IQ80310 -- Intel IQ80310 Evaluation Board Kernel
 #
@@ -81,6 +81,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/IQ80321 b/sys/arch/evbarm/conf/IQ80321
index 094ad8fd8578..0345ec99a511 100644
--- a/sys/arch/evbarm/conf/IQ80321
+++ b/sys/arch/evbarm/conf/IQ80321
@@ -1,4 +1,4 @@
-#	$NetBSD: IQ80321,v 1.42 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: IQ80321,v 1.43 2005/08/19 02:03:51 christos Exp $
 #
 #	IQ80321 -- Intel IQ80321 Evaluation Board Kernel
 #
@@ -81,6 +81,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/IXDP425 b/sys/arch/evbarm/conf/IXDP425
index 722510b88b16..7d572d9c2cf1 100644
--- a/sys/arch/evbarm/conf/IXDP425
+++ b/sys/arch/evbarm/conf/IXDP425
@@ -1,4 +1,4 @@
-#	$NetBSD: IXDP425,v 1.13 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: IXDP425,v 1.14 2005/08/19 02:03:51 christos Exp $
 #
 #	IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform
 #
@@ -85,6 +85,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/IXM1200 b/sys/arch/evbarm/conf/IXM1200
index b10b70205342..14399e8988f5 100644
--- a/sys/arch/evbarm/conf/IXM1200
+++ b/sys/arch/evbarm/conf/IXM1200
@@ -1,4 +1,4 @@
-#	$NetBSD: IXM1200,v 1.17 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: IXM1200,v 1.18 2005/08/19 02:03:51 christos Exp $
 #
 #	IXM1200 -- Intel IXM1200 Evaluation Board Kernel
 #
@@ -80,6 +80,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/LUBBOCK b/sys/arch/evbarm/conf/LUBBOCK
index 4c93b65df03f..ee51c05e5cfd 100644
--- a/sys/arch/evbarm/conf/LUBBOCK
+++ b/sys/arch/evbarm/conf/LUBBOCK
@@ -79,6 +79,7 @@ options 	NFS_BOOT_BOOTPARAM
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 #options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/NAPPI b/sys/arch/evbarm/conf/NAPPI
index d46d5a567899..2a15f316b8f4 100644
--- a/sys/arch/evbarm/conf/NAPPI
+++ b/sys/arch/evbarm/conf/NAPPI
@@ -1,4 +1,4 @@
-#	$NetBSD: NAPPI,v 1.19 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: NAPPI,v 1.20 2005/08/19 02:03:51 christos Exp $
 #
 #	NAPPI -- Netwise APlication Platform Board Kernel
 #
@@ -80,6 +80,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/SMDK2410 b/sys/arch/evbarm/conf/SMDK2410
index 4d0f0df6500b..717f54002fdd 100644
--- a/sys/arch/evbarm/conf/SMDK2410
+++ b/sys/arch/evbarm/conf/SMDK2410
@@ -1,4 +1,4 @@
-#	$NetBSD: SMDK2410,v 1.23 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: SMDK2410,v 1.24 2005/08/19 02:03:51 christos Exp $
 #
 #	SMDK2410 -- Samsung's S3C2410 evaluation board.
 #
@@ -99,6 +99,7 @@ options 	NFS_BOOT_BOOTPARAM
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 #options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/SMDK2800 b/sys/arch/evbarm/conf/SMDK2800
index 1a6eaf6966ec..392225ab1f96 100644
--- a/sys/arch/evbarm/conf/SMDK2800
+++ b/sys/arch/evbarm/conf/SMDK2800
@@ -1,4 +1,4 @@
-#	$NetBSD: SMDK2800,v 1.26 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: SMDK2800,v 1.27 2005/08/19 02:03:51 christos Exp $
 #
 #	SMDK2800 -- Samsung's S3C2800 evaluation board.
 #
@@ -88,6 +88,7 @@ options 	NFS_BOOT_BOOTPARAM
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 #options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/TEAMASA_NPWR b/sys/arch/evbarm/conf/TEAMASA_NPWR
index 0bd40f2d197b..0ff6d9aa13c7 100644
--- a/sys/arch/evbarm/conf/TEAMASA_NPWR
+++ b/sys/arch/evbarm/conf/TEAMASA_NPWR
@@ -1,4 +1,4 @@
-#	$NetBSD: TEAMASA_NPWR,v 1.43 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: TEAMASA_NPWR,v 1.44 2005/08/19 02:03:51 christos Exp $
 #
 #	TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based
 #	server appliance.
@@ -84,6 +84,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/TEAMASA_NPWR_FC b/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
index 049173a99384..21220e6f17ce 100644
--- a/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
+++ b/sys/arch/evbarm/conf/TEAMASA_NPWR_FC
@@ -1,4 +1,4 @@
-#	$NetBSD: TEAMASA_NPWR_FC,v 1.12 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: TEAMASA_NPWR_FC,v 1.13 2005/08/19 02:03:51 christos Exp $
 #
 #	TeamASA NPWR-FC, i80321-based SBC
 #
@@ -82,6 +82,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/TS7200 b/sys/arch/evbarm/conf/TS7200
index 404b50ea0b52..e36206627146 100644
--- a/sys/arch/evbarm/conf/TS7200
+++ b/sys/arch/evbarm/conf/TS7200
@@ -1,4 +1,4 @@
-#	$NetBSD: TS7200,v 1.19 2005/08/14 04:30:08 joff Exp $
+#	$NetBSD: TS7200,v 1.20 2005/08/19 02:03:51 christos Exp $
 #
 #	GENERIC -- Generic kernel
 #
@@ -77,6 +77,7 @@ options 	NFS_BOOT_DHCP
 
 #options 	COMPAT_LINUX
 options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0
 #options 	COMPAT_43	# 4.3BSD compatibility.
 #options 	COMPAT_16	# NetBSD 1.6 compatibility.
diff --git a/sys/arch/evbarm/conf/TWINTAIL b/sys/arch/evbarm/conf/TWINTAIL
index a1c795944685..a1f8efd05975 100644
--- a/sys/arch/evbarm/conf/TWINTAIL
+++ b/sys/arch/evbarm/conf/TWINTAIL
@@ -1,4 +1,4 @@
-#	$NetBSD: TWINTAIL,v 1.8 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: TWINTAIL,v 1.9 2005/08/19 02:03:51 christos Exp $
 #
 #	TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel
 #
@@ -84,6 +84,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 #options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbarm/conf/VIPER b/sys/arch/evbarm/conf/VIPER
index 3a20d4bd8a48..7444c00b5cee 100644
--- a/sys/arch/evbarm/conf/VIPER
+++ b/sys/arch/evbarm/conf/VIPER
@@ -1,4 +1,4 @@
-#	$NetBSD: VIPER,v 1.5 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: VIPER,v 1.6 2005/08/19 02:03:51 christos Exp $
 #
 #	Arcom Viper
 #
@@ -77,9 +77,9 @@ options 	NFS_BOOT_RWSIZE=1024
 # Compatibility options
 
 #options 	COMPAT_LINUX
-#options 	COMPAT_16	# NetBSD 1.6
-#options 	COMPAT_20	# NetBSD 2.0
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
+#options 	COMPAT_20	# NetBSD 2.0
 #options 	COMPAT_16	# NetBSD 1.6 compatibility.
 #options 	COMPAT_15	# NetBSD 1.5 compatibility.
 #options 	COMPAT_14	# NetBSD 1.4 compatibility.
diff --git a/sys/arch/evbarm/conf/ZAO425 b/sys/arch/evbarm/conf/ZAO425
index 37d31119b72f..27ea1a2076ce 100644
--- a/sys/arch/evbarm/conf/ZAO425
+++ b/sys/arch/evbarm/conf/ZAO425
@@ -1,4 +1,4 @@
-#	$NetBSD: ZAO425,v 1.21 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: ZAO425,v 1.22 2005/08/19 02:03:51 christos Exp $
 #
 #	ZAO425 -- Intel IXP425
 #
@@ -85,6 +85,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/evbmips/conf/MALTA b/sys/arch/evbmips/conf/MALTA
index aa5371aadf4b..69b7f4de81ef 100644
--- a/sys/arch/evbmips/conf/MALTA
+++ b/sys/arch/evbmips/conf/MALTA
@@ -1,10 +1,10 @@
-#	$NetBSD: MALTA,v 1.33 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: MALTA,v 1.34 2005/08/19 02:03:51 christos Exp $
 
 include 	"arch/evbmips/conf/std.malta"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"MALTA-$Revision: 1.33 $"
+#ident 		"MALTA-$Revision: 1.34 $"
 
 maxusers	32
 
@@ -50,6 +50,7 @@ options 	SYMTAB_SPACE=150000	# size for embedded symbol table
 #options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	EXEC_ECOFF	# exec ECOFF binaries
 #options 	COMPAT_ULTRIX	# binary compatibility with Ultrix
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/evbmips/conf/PB1000 b/sys/arch/evbmips/conf/PB1000
index 81cd01384dc5..003343f76e2b 100644
--- a/sys/arch/evbmips/conf/PB1000
+++ b/sys/arch/evbmips/conf/PB1000
@@ -1,11 +1,11 @@
-#	$NetBSD: PB1000,v 1.23 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: PB1000,v 1.24 2005/08/19 02:03:51 christos Exp $
 #
 # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500,
 # DBAu1000 and DBAu1500 evaluation boards.
 
 include 	"arch/evbmips/conf/std.pb1000"
 
-#ident 		"PB1000-$Revision: 1.23 $"
+#ident 		"PB1000-$Revision: 1.24 $"
 
 maxusers	32
 
@@ -51,6 +51,7 @@ options 	SYMTAB_SPACE=180000	# size for embedded symbol table
 #options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	EXEC_ECOFF	# exec ECOFF binaries
 #options 	COMPAT_ULTRIX	# binary compatibility with Ultrix
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/evbppc/conf/EV64260 b/sys/arch/evbppc/conf/EV64260
index 53f5ae04f7b1..285f5d0c8f18 100644
--- a/sys/arch/evbppc/conf/EV64260
+++ b/sys/arch/evbppc/conf/EV64260
@@ -1,4 +1,4 @@
-#	$NetBSD: EV64260,v 1.25 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: EV64260,v 1.26 2005/08/19 02:03:51 christos Exp $
 #
 #	MVP -- Motorola's Multiprocessing Verification Platform
 #
@@ -71,6 +71,7 @@ makeoptions	DEBUG="-g"
 #options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/evbppc/conf/EXPLORA451 b/sys/arch/evbppc/conf/EXPLORA451
index 8c0f0368c544..574664acbfc5 100644
--- a/sys/arch/evbppc/conf/EXPLORA451
+++ b/sys/arch/evbppc/conf/EXPLORA451
@@ -1,4 +1,4 @@
-#	$NetBSD: EXPLORA451,v 1.16 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: EXPLORA451,v 1.17 2005/08/19 02:03:51 christos Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -68,6 +68,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/evbppc/conf/OPENBLOCKS266 b/sys/arch/evbppc/conf/OPENBLOCKS266
index f2fbdb152798..254981880827 100644
--- a/sys/arch/evbppc/conf/OPENBLOCKS266
+++ b/sys/arch/evbppc/conf/OPENBLOCKS266
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS266,v 1.22 2005/08/01 13:02:00 shige Exp $
+#	$NetBSD: OPENBLOCKS266,v 1.23 2005/08/19 02:03:51 christos Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -55,6 +55,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/evbppc/conf/WALNUT b/sys/arch/evbppc/conf/WALNUT
index 8b9c03712142..4f2d2108fe7b 100644
--- a/sys/arch/evbppc/conf/WALNUT
+++ b/sys/arch/evbppc/conf/WALNUT
@@ -1,4 +1,4 @@
-#	$NetBSD: WALNUT,v 1.23 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: WALNUT,v 1.24 2005/08/19 02:03:51 christos Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -55,6 +55,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/evbsh5/conf/CAYMAN b/sys/arch/evbsh5/conf/CAYMAN
index 81eb8e37a86f..3cff1d1e3262 100644
--- a/sys/arch/evbsh5/conf/CAYMAN
+++ b/sys/arch/evbsh5/conf/CAYMAN
@@ -1,4 +1,4 @@
-#	$NetBSD: CAYMAN,v 1.18 2005/02/26 21:16:43 scw Exp $
+#	$NetBSD: CAYMAN,v 1.19 2005/08/19 02:03:51 christos Exp $
 
 #
 # Config file for SuperH "CAYMAN" SH-5 Evaluation board
@@ -11,7 +11,7 @@ maxusers	8
 options 	INCLUDE_CONFIG_FILE
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
-#ident		"CAYMAN-$Revision: 1.18 $"
+#ident		"CAYMAN-$Revision: 1.19 $"
 
 # Uncomment this to build a 64-bit kernel
 #makeoptions 	SH5_ABI=64
@@ -29,6 +29,7 @@ options 	DDB
 
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_BSDPTY
 
 options 	KTRACE		# system call tracing via ktrace(1)
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 4dad269d97eb..81a4befad5c1 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.119 2005/07/31 04:04:31 yamt Exp $
+# $NetBSD: GENERIC,v 1.120 2005/08/19 02:03:51 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/hp300/conf/std.hp300"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.119 $"
+#ident 		"GENERIC-$Revision: 1.120 $"
 
 maxusers	32		# estimated number of users
 
@@ -88,6 +88,7 @@ options 	COMPAT_14	# compatibility with NetBSD 1.4
 options 	COMPAT_15	# compatibility with NetBSD 1.5
 options 	COMPAT_16	# compatibility with NetBSD 1.6
 options 	COMPAT_20	# compatibility with NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
 # Binary compatibility.
diff --git a/sys/arch/hp300/conf/INSTALL b/sys/arch/hp300/conf/INSTALL
index 3af774024a4e..f8ee36dcf5d4 100644
--- a/sys/arch/hp300/conf/INSTALL
+++ b/sys/arch/hp300/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.24 2005/07/07 17:05:47 tron Exp $
+# $NetBSD: INSTALL,v 1.25 2005/08/19 02:03:51 christos Exp $
 #
 # INSTALL machine description file
 #
@@ -54,6 +54,7 @@ maxusers	32
 #options 	COMPAT_15	# compatibility with NetBSD 1.5
 #options 	COMPAT_16	# compatibility with NetBSD 1.6
 #options 	COMPAT_20	# compatibility with NetBSD 2.0
+#options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 #options 	SYSVSHM		# System V-style shared memory
diff --git a/sys/arch/hp700/conf/GENERIC b/sys/arch/hp700/conf/GENERIC
index d88f14d669d0..9ef59bf513bc 100644
--- a/sys/arch/hp700/conf/GENERIC
+++ b/sys/arch/hp700/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.51 2005/07/31 04:04:31 yamt Exp $
+# $NetBSD: GENERIC,v 1.52 2005/08/19 02:03:51 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -23,7 +23,7 @@ include 	"arch/hp700/conf/std.hp700"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
-#ident 		"GENERIC-$Revision: 1.51 $"
+#ident 		"GENERIC-$Revision: 1.52 $"
 
 maxusers	32		# estimated number of users
 
@@ -84,6 +84,7 @@ options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 
 # Compatibility options
 options 	COMPAT_20	# compatability with NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
diff --git a/sys/arch/hpcarm/conf/IPAQ b/sys/arch/hpcarm/conf/IPAQ
index 907db7841a3f..a7ab670d43db 100644
--- a/sys/arch/hpcarm/conf/IPAQ
+++ b/sys/arch/hpcarm/conf/IPAQ
@@ -1,4 +1,4 @@
-#	$NetBSD: IPAQ,v 1.38 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: IPAQ,v 1.39 2005/08/19 02:03:51 christos Exp $
 #
 #	iPAQ H3600 -- Windows-CE based PDA
 #
@@ -78,6 +78,7 @@ options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
 # Compatibility options
 
 options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_14	# NetBSD 1.4 compatibility.
diff --git a/sys/arch/hpcarm/conf/JORNADA720 b/sys/arch/hpcarm/conf/JORNADA720
index 91438f57f08f..e437c8d3875d 100644
--- a/sys/arch/hpcarm/conf/JORNADA720
+++ b/sys/arch/hpcarm/conf/JORNADA720
@@ -1,4 +1,4 @@
-#	$NetBSD: JORNADA720,v 1.44 2005/07/31 04:04:31 yamt Exp $
+#	$NetBSD: JORNADA720,v 1.45 2005/08/19 02:03:51 christos Exp $
 #
 #	JORNADA -- Windows-CE based jornada 720
 #
@@ -7,7 +7,7 @@ include	"arch/hpcarm/conf/std.hpcarm"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.44 $"
+#ident 		"GENERIC-$Revision: 1.45 $"
 
 # estimated number of users
 maxusers	32
@@ -80,6 +80,7 @@ options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_14	# NetBSD 1.4 compatibility.
diff --git a/sys/arch/hpcmips/conf/GENERIC b/sys/arch/hpcmips/conf/GENERIC
index c98773950c0e..9c6d9e17cae8 100644
--- a/sys/arch/hpcmips/conf/GENERIC
+++ b/sys/arch/hpcmips/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.174 2005/08/05 09:23:16 skrll Exp $
+# $NetBSD: GENERIC,v 1.175 2005/08/19 02:03:51 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -24,7 +24,7 @@ include		"arch/hpcmips/conf/std.hpcmips.tx39"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.174 $"
+#ident 		"GENERIC-$Revision: 1.175 $"
 
 maxusers	16
 
@@ -129,6 +129,7 @@ options 	INET6		# IPV6
 options 	COMPAT_43
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 options 	LKM		# loadable kernel modules
diff --git a/sys/arch/hpcsh/conf/GENERIC b/sys/arch/hpcsh/conf/GENERIC
index a51a43c955e6..823df3f4c23a 100644
--- a/sys/arch/hpcsh/conf/GENERIC
+++ b/sys/arch/hpcsh/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.53 2005/07/31 04:04:32 yamt Exp $
+# $NetBSD: GENERIC,v 1.54 2005/08/19 02:03:51 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -106,6 +106,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	BSDDISKLABEL_EI	# endian independent disklabel support
 options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
diff --git a/sys/arch/i386/conf/DISKLESS b/sys/arch/i386/conf/DISKLESS
index c1aff4c435cc..c6fe2617ba79 100644
--- a/sys/arch/i386/conf/DISKLESS
+++ b/sys/arch/i386/conf/DISKLESS
@@ -1,4 +1,4 @@
-#	$NetBSD: DISKLESS,v 1.106 2005/07/31 04:04:32 yamt Exp $
+#	$NetBSD: DISKLESS,v 1.107 2005/08/19 02:03:51 christos Exp $
 #
 # DISKLESS -- Generic machine setup for diskless boot.
 # This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@@ -60,6 +60,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 3a3848b4f945..0f78e11c9965 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.694 2005/08/18 15:57:00 perry Exp $
+# $NetBSD: GENERIC,v 1.695 2005/08/19 02:03:51 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.694 $"
+#ident 		"GENERIC-$Revision: 1.695 $"
 
 maxusers	32		# estimated number of users
 
@@ -127,6 +127,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/GENERIC.MPACPI b/sys/arch/i386/conf/GENERIC.MPACPI
index d47be61bc80f..70f207f3fabb 100644
--- a/sys/arch/i386/conf/GENERIC.MPACPI
+++ b/sys/arch/i386/conf/GENERIC.MPACPI
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC.MPACPI,v 1.40 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: GENERIC.MPACPI,v 1.41 2005/08/19 02:03:51 christos Exp $
 #
 #	GENERIC.MPACPI -- Generic, plus ACPI Multiprocessor support
 #
@@ -8,7 +8,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.40 $"
+#ident 		"GENERIC-$Revision: 1.41 $"
 
 maxusers	32		# estimated number of users
 
@@ -116,6 +116,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/GENERIC.local b/sys/arch/i386/conf/GENERIC.local
index 26998a80e406..c4809ccb87bb 100644
--- a/sys/arch/i386/conf/GENERIC.local
+++ b/sys/arch/i386/conf/GENERIC.local
@@ -1,5 +1,4 @@
-#	$NetBSD: GENERIC.local,v 1.1 1996/09/09 16:37:08 mycroft Exp $
+#	$NetBSD: GENERIC.local,v 1.2 2005/08/19 02:03:51 christos Exp $
 #
 #	GENERIC.local -- local additions to the GENERIC configuration
 #
-
diff --git a/sys/arch/i386/conf/GENERIC_LAPTOP b/sys/arch/i386/conf/GENERIC_LAPTOP
index a544203fd133..426b0f3b9075 100644
--- a/sys/arch/i386/conf/GENERIC_LAPTOP
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_LAPTOP,v 1.150 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: GENERIC_LAPTOP,v 1.151 2005/08/19 02:03:51 christos Exp $
 #	From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
 #
 #	GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.150 $"
+#ident 		"GENERIC-$Revision: 1.151 $"
 
 maxusers	32		# estimated number of users
 
@@ -96,6 +96,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/GENERIC_TINY b/sys/arch/i386/conf/GENERIC_TINY
index 2d14951b6505..8ae9b29b7e0a 100644
--- a/sys/arch/i386/conf/GENERIC_TINY
+++ b/sys/arch/i386/conf/GENERIC_TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_TINY,v 1.89 2005/07/31 04:04:32 yamt Exp $
+#	$NetBSD: GENERIC_TINY,v 1.90 2005/08/19 02:03:52 christos Exp $
 #
 #	GENERIC_TINY -- suitable default for 4M machines
 #			No EISA, PCI, or SCSI.
@@ -85,6 +85,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTALL
index 08028f68c612..9dc9c8c305b0 100644
--- a/sys/arch/i386/conf/INSTALL
+++ b/sys/arch/i386/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.268 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: INSTALL,v 1.269 2005/08/19 02:03:52 christos Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -93,6 +93,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/INSTALL_LAPTOP b/sys/arch/i386/conf/INSTALL_LAPTOP
index aaa5e842c90d..a6722613eed6 100644
--- a/sys/arch/i386/conf/INSTALL_LAPTOP
+++ b/sys/arch/i386/conf/INSTALL_LAPTOP
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_LAPTOP,v 1.86 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: INSTALL_LAPTOP,v 1.87 2005/08/19 02:03:52 christos Exp $
 #
 #	INSTALL - Installation kernel.
 #
@@ -92,6 +92,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/INSTALL_SMALL b/sys/arch/i386/conf/INSTALL_SMALL
index c232266f9863..12ae6f69cd71 100644
--- a/sys/arch/i386/conf/INSTALL_SMALL
+++ b/sys/arch/i386/conf/INSTALL_SMALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_SMALL,v 1.114 2005/06/28 09:08:04 wiz Exp $
+#	$NetBSD: INSTALL_SMALL,v 1.115 2005/08/19 02:03:52 christos Exp $
 #
 #	INSTALL_SMALL - Small Installation kernel.
 #
@@ -92,6 +92,7 @@ options 	MALLOC_NOINLINE		# Not inlining MALLOC saves memory
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/INSTALL_TINY b/sys/arch/i386/conf/INSTALL_TINY
index 6232644afa50..3e02289b41a6 100644
--- a/sys/arch/i386/conf/INSTALL_TINY
+++ b/sys/arch/i386/conf/INSTALL_TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_TINY,v 1.92 2005/07/05 21:17:38 tron Exp $
+#	$NetBSD: INSTALL_TINY,v 1.93 2005/08/19 02:03:52 christos Exp $
 #
 #	This kernel should be derived from INSTALL (which is derived
 #	from GENERIC) with some features commented out.
@@ -91,6 +91,7 @@ no options	EXEC_AOUT	# we don't a.out support
 #options 	COMPAT_15	# NetBSD 1.5
 #options 	COMPAT_16	# NetBSD 1.6
 #options 	COMPAT_20	# NetBSD 2.0
+#options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/INSTALL_XENU b/sys/arch/i386/conf/INSTALL_XENU
index 11a0518abb0d..ddd16652b6fc 100644
--- a/sys/arch/i386/conf/INSTALL_XENU
+++ b/sys/arch/i386/conf/INSTALL_XENU
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL_XENU,v 1.3 2005/04/21 16:33:29 bouyer Exp $
+# $NetBSD: INSTALL_XENU,v 1.4 2005/08/19 02:03:52 christos Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -67,6 +67,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/IOPENER b/sys/arch/i386/conf/IOPENER
index f7d7c6592d6e..e8bb32f13f7e 100644
--- a/sys/arch/i386/conf/IOPENER
+++ b/sys/arch/i386/conf/IOPENER
@@ -1,4 +1,4 @@
-#	$NetBSD: IOPENER,v 1.65 2005/08/05 09:23:16 skrll Exp $
+#	$NetBSD: IOPENER,v 1.66 2005/08/19 02:03:52 christos Exp $
 #
 #	IOPENER -- GENERIC-like kernel for the Netpliance i-opener
 #	from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
@@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"IOPENER-$Revision: 1.65 $"
+#ident 		"IOPENER-$Revision: 1.66 $"
 
 maxusers	32		# estimated number of users
 
@@ -70,6 +70,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/LAMB b/sys/arch/i386/conf/LAMB
index 980a4b3358cc..e22920a81052 100644
--- a/sys/arch/i386/conf/LAMB
+++ b/sys/arch/i386/conf/LAMB
@@ -1,4 +1,4 @@
-#	$NetBSD: LAMB,v 1.54 2005/07/31 04:04:32 yamt Exp $
+#	$NetBSD: LAMB,v 1.55 2005/08/19 02:03:52 christos Exp $
 #
 #	LAMB - a complete kernel for wildlab LAMB, http://www.wildlab.com/
 #
@@ -92,6 +92,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/NET4501 b/sys/arch/i386/conf/NET4501
index cfb051800e5c..d2a3e6c69333 100644
--- a/sys/arch/i386/conf/NET4501
+++ b/sys/arch/i386/conf/NET4501
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.37 2005/07/31 04:04:32 yamt Exp $
+# $NetBSD: NET4501,v 1.38 2005/08/19 02:03:52 christos Exp $
 #
 # NET4501 -- kernel configuration for a Soekris Engineering net4501
 # single-board computer.
@@ -10,7 +10,7 @@ include 	"arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"NET4501-$Revision: 1.37 $"
+#ident 		"NET4501-$Revision: 1.38 $"
 
 maxusers	32		# estimated number of users
 
@@ -98,6 +98,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/SWINGER b/sys/arch/i386/conf/SWINGER
index 82d6932eca29..d6b2f52d11dc 100644
--- a/sys/arch/i386/conf/SWINGER
+++ b/sys/arch/i386/conf/SWINGER
@@ -1,4 +1,4 @@
-#	$NetBSD: SWINGER,v 1.70 2005/08/05 09:23:17 skrll Exp $
+#	$NetBSD: SWINGER,v 1.71 2005/08/19 02:03:52 christos Exp $
 #	from NetBSD: GENERIC,v 1.325 2000/04/14 14:53:32 augustss Exp
 #
 #	SWINGER -- thorpej's Abit BP6+dual Celeron
@@ -8,7 +8,7 @@ include "arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"SWINGER-$Revision: 1.70 $"
+#ident 		"SWINGER-$Revision: 1.71 $"
 
 maxusers	64		# estimated number of users
 
@@ -82,6 +82,7 @@ options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/VIRTUALPC b/sys/arch/i386/conf/VIRTUALPC
index 5e11b1a726e4..03a8db2c8564 100644
--- a/sys/arch/i386/conf/VIRTUALPC
+++ b/sys/arch/i386/conf/VIRTUALPC
@@ -1,4 +1,4 @@
-# $NetBSD: VIRTUALPC,v 1.26 2005/08/05 09:23:17 skrll Exp $
+# $NetBSD: VIRTUALPC,v 1.27 2005/08/19 02:03:52 christos Exp $
 #
 # VIRTUALPC machine description file --
 #
@@ -11,7 +11,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"VIRTUALPC-$Revision: 1.26 $"
+#ident 		"VIRTUALPC-$Revision: 1.27 $"
 
 maxusers	32		# estimated number of users
 
@@ -112,6 +112,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/XEN0 b/sys/arch/i386/conf/XEN0
index 2e1cff56f997..26adf1d7e069 100644
--- a/sys/arch/i386/conf/XEN0
+++ b/sys/arch/i386/conf/XEN0
@@ -1,4 +1,4 @@
-# $NetBSD: XEN0,v 1.9 2005/08/05 09:23:17 skrll Exp $
+# $NetBSD: XEN0,v 1.10 2005/08/19 02:03:52 christos Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -70,6 +70,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/i386/conf/XENU b/sys/arch/i386/conf/XENU
index 20f16809ac3d..1d9b64c42915 100644
--- a/sys/arch/i386/conf/XENU
+++ b/sys/arch/i386/conf/XENU
@@ -1,4 +1,4 @@
-# $NetBSD: XENU,v 1.5 2005/07/31 04:04:32 yamt Exp $
+# $NetBSD: XENU,v 1.6 2005/08/19 02:03:52 christos Exp $
 
 include 	"arch/xen/conf/std.xen"
 
@@ -70,6 +70,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/iyonix/conf/GENERIC b/sys/arch/iyonix/conf/GENERIC
index fe0cc8f33d1a..57a194c66445 100644
--- a/sys/arch/iyonix/conf/GENERIC
+++ b/sys/arch/iyonix/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.16 2005/08/05 09:23:17 skrll Exp $
+#	$NetBSD: GENERIC,v 1.17 2005/08/19 02:03:52 christos Exp $
 #
 #	GENERIC -- Generic kernel
 #
@@ -90,6 +90,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0
 #options 	COMPAT_43	# 4.3BSD compatibility.
 #options 	COMPAT_16	# NetBSD 1.6 compatibility.
diff --git a/sys/arch/luna68k/conf/GENERIC b/sys/arch/luna68k/conf/GENERIC
index 4114f769a791..698f95ebb5e2 100644
--- a/sys/arch/luna68k/conf/GENERIC
+++ b/sys/arch/luna68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.62 2005/07/31 04:04:42 yamt Exp $
+# $NetBSD: GENERIC,v 1.63 2005/08/19 02:03:52 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/luna68k/conf/std.luna68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.62 $"
+#ident 		"GENERIC-$Revision: 1.63 $"
 
 maxusers	8
 
@@ -73,6 +73,7 @@ options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_15	# NetBSD 1.5 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 options 	EXEC_AOUT	# support for a.out executables
diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC
index c5b0667731c4..bc7a18bc455c 100644
--- a/sys/arch/mac68k/conf/GENERIC
+++ b/sys/arch/mac68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.162 2005/07/31 04:04:42 yamt Exp $
+# $NetBSD: GENERIC,v 1.163 2005/08/19 02:03:52 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/mac68k/conf/std.mac68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.162 $"
+#ident 		"GENERIC-$Revision: 1.163 $"
 
 maxusers	16		# estimated number of users
 
@@ -88,6 +88,7 @@ options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_15	# NetBSD 1.5,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
diff --git a/sys/arch/mac68k/conf/GENERICSBC b/sys/arch/mac68k/conf/GENERICSBC
index 6fda093cacbf..bf897b236d04 100644
--- a/sys/arch/mac68k/conf/GENERICSBC
+++ b/sys/arch/mac68k/conf/GENERICSBC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERICSBC,v 1.46 2005/07/31 04:04:43 yamt Exp $
+#	$NetBSD: GENERICSBC,v 1.47 2005/08/19 02:03:52 christos Exp $
 #
 # GENERICSBC
 
@@ -6,7 +6,7 @@ include	"arch/mac68k/conf/std.mac68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERICSBC-$Revision: 1.46 $"
+#ident 		"GENERICSBC-$Revision: 1.47 $"
 
 maxusers	16		# estimated number of users
 
@@ -66,6 +66,7 @@ options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_15	# NetBSD 1.5,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
diff --git a/sys/arch/mac68k/conf/SMALLRAM b/sys/arch/mac68k/conf/SMALLRAM
index 19b927a87ef1..1aaca70230db 100644
--- a/sys/arch/mac68k/conf/SMALLRAM
+++ b/sys/arch/mac68k/conf/SMALLRAM
@@ -1,4 +1,4 @@
-#	$NetBSD: SMALLRAM,v 1.20 2005/07/31 04:04:43 yamt Exp $
+#	$NetBSD: SMALLRAM,v 1.21 2005/08/19 02:03:52 christos Exp $
 #
 # This is an example of how to configure a small, efficient kernel for a
 # system with limited RAM. Even so it's capable of doing quite a bit. The
@@ -13,7 +13,7 @@ include	"arch/mac68k/conf/std.mac68k"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"SMALLRAM-$Revision: 1.20 $"
+#ident 		"SMALLRAM-$Revision: 1.21 $"
 
 maxusers	8
 
@@ -74,6 +74,7 @@ options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_15	# NetBSD 1.5,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_43	# and 4.3BSD
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC
index ce26c280c11b..84372cd9e686 100644
--- a/sys/arch/macppc/conf/GENERIC
+++ b/sys/arch/macppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.208 2005/08/10 15:57:32 macallan Exp $
+# $NetBSD: GENERIC,v 1.209 2005/08/19 02:03:52 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.208 $"
+#ident 		"GENERIC-$Revision: 1.209 $"
 
 maxusers	32
 
@@ -77,6 +77,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 options 	COMPAT_LINUX	# Linux binary compatibility
diff --git a/sys/arch/macppc/conf/INSTALL b/sys/arch/macppc/conf/INSTALL
index 9ee5f42512f1..2baac7c88ba9 100644
--- a/sys/arch/macppc/conf/INSTALL
+++ b/sys/arch/macppc/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.90 2005/06/09 13:29:57 tron Exp $
+#	$NetBSD: INSTALL,v 1.91 2005/08/19 02:03:52 christos Exp $
 #
 # config file for INSTALL FLOPPY
 #
@@ -29,6 +29,7 @@ options 	MALLOC_NOINLINE		# Not inlining MALLOC saves memory
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
diff --git a/sys/arch/macppc/conf/POWERMAC b/sys/arch/macppc/conf/POWERMAC
index aa814cd2f848..439bfb162140 100644
--- a/sys/arch/macppc/conf/POWERMAC
+++ b/sys/arch/macppc/conf/POWERMAC
@@ -1,4 +1,4 @@
-#	$NetBSD: POWERMAC,v 1.49 2005/07/31 04:04:43 yamt Exp $
+#	$NetBSD: POWERMAC,v 1.50 2005/08/19 02:03:52 christos Exp $
 #
 # POWERMAC config file
 #
@@ -30,6 +30,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
diff --git a/sys/arch/mipsco/conf/GENERIC b/sys/arch/mipsco/conf/GENERIC
index 75de18780bef..03ca534dd2d8 100644
--- a/sys/arch/mipsco/conf/GENERIC
+++ b/sys/arch/mipsco/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.49 2005/07/31 04:04:43 yamt Exp $
+# $NetBSD: GENERIC,v 1.50 2005/08/19 02:03:52 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -71,6 +71,7 @@ options 	COMPAT_13		# NetBSD 1.3 binary compatibility
 options 	COMPAT_14		# NetBSD 1.4 binary compatibility
 options 	COMPAT_16		# NetBSD 1.6 binary compatibility
 options 	COMPAT_20		# NetBSD 2.0 binary compatibility
+options 	COMPAT_30		# NetBSD 3.0 compatibility.
 #options 	EXEC_AOUT		# exec a.out binaries
 #options 	EXEC_ECOFF		# exec ecoff binaries
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/mipsco/conf/RC3230 b/sys/arch/mipsco/conf/RC3230
index 4677368ff0f1..e33acfddc128 100644
--- a/sys/arch/mipsco/conf/RC3230
+++ b/sys/arch/mipsco/conf/RC3230
@@ -1,5 +1,5 @@
 #
-# 	$NetBSD: RC3230,v 1.25 2005/07/31 04:04:43 yamt Exp $
+# 	$NetBSD: RC3230,v 1.26 2005/08/19 02:03:52 christos Exp $
 #
 include		"arch/mipsco/conf/std.mipsco"
 
@@ -43,6 +43,7 @@ options 	COMPAT_13		# NetBSD 1.3 binary compatibility
 options 	COMPAT_14		# NetBSD 1.4 binary compatibility
 options 	COMPAT_16		# NetBSD 1.6 binary compatibility
 options 	COMPAT_20		# NetBSD 2.0 binary compatibility
+options 	COMPAT_30		# NetBSD 3.0 compatibility.
 #options 	EXEC_AOUT		# exec a.out binaries
 #options 	EXEC_ECOFF		# exec ecoff binaries
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/mmeye/conf/GENERIC b/sys/arch/mmeye/conf/GENERIC
index bcbfd8e6214d..dcff7a292437 100644
--- a/sys/arch/mmeye/conf/GENERIC
+++ b/sys/arch/mmeye/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.71 2005/07/31 04:04:43 yamt Exp $
+# $NetBSD: GENERIC,v 1.72 2005/08/19 02:03:52 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/mmeye/conf/std.mmeye"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.71 $"
+#ident 		"GENERIC-$Revision: 1.72 $"
 
 maxusers	16		# estimated number of users
 
@@ -71,6 +71,7 @@ options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	BSDDISKLABEL_EI	# endian independent disklabel support
diff --git a/sys/arch/mmeye/conf/MMEYE b/sys/arch/mmeye/conf/MMEYE
index c7f86331140e..2495b94e7d0b 100644
--- a/sys/arch/mmeye/conf/MMEYE
+++ b/sys/arch/mmeye/conf/MMEYE
@@ -1,4 +1,4 @@
-#	$NetBSD: MMEYE,v 1.29 2005/07/31 04:04:43 yamt Exp $
+#	$NetBSD: MMEYE,v 1.30 2005/08/19 02:03:52 christos Exp $
 #
 #	GENERIC -- everything that's currently supported
 #
@@ -41,6 +41,7 @@ options 	USERCONF	# userconf(4) support
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	BSDDISKLABEL_EI	# endian independent disklabel support
 options 	COMPAT_MMEYE_OLDLABEL	# old mmeye's disklabel support
diff --git a/sys/arch/mvme68k/conf/GENERIC b/sys/arch/mvme68k/conf/GENERIC
index c0addc7f5d90..bd7ae5b7e15c 100644
--- a/sys/arch/mvme68k/conf/GENERIC
+++ b/sys/arch/mvme68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.57 2005/07/17 00:08:29 hubertf Exp $
+# $NetBSD: GENERIC,v 1.58 2005/08/19 02:03:52 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/mvme68k/conf/std.mvme68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.57 $"
+#ident 		"GENERIC-$Revision: 1.58 $"
 
 # Boards this kernel supports
 options 	MVME147
@@ -106,6 +106,7 @@ options 	COMPAT_14
 options 	COMPAT_15
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_SUNOS
 #options 	COMPAT_M68K4K	# compatibility with NetBSD/m68k4k binaries
 #options 	COMPAT_LINUX	# compatibility with Linux/m68k binaries
diff --git a/sys/arch/mvme68k/conf/VME147 b/sys/arch/mvme68k/conf/VME147
index 17dbbd4c3324..fea383a2cdd2 100644
--- a/sys/arch/mvme68k/conf/VME147
+++ b/sys/arch/mvme68k/conf/VME147
@@ -1,4 +1,4 @@
-#	$NetBSD: VME147,v 1.48 2005/02/25 13:46:50 simonb Exp $
+#	$NetBSD: VME147,v 1.49 2005/08/19 02:03:52 christos Exp $
 
 include		"arch/mvme68k/conf/std.mvme68k"
 
@@ -49,6 +49,7 @@ options 	COMPAT_14
 options 	COMPAT_15
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_SUNOS
 #options 	COMPAT_M68K4K	# compatibility with NetBSD/m68k4k binaries
 #options 	COMPAT_LINUX	# compatibility with Linux/m68k binaries
diff --git a/sys/arch/mvme68k/conf/VME162 b/sys/arch/mvme68k/conf/VME162
index fd38addfcd33..2659e215944b 100644
--- a/sys/arch/mvme68k/conf/VME162
+++ b/sys/arch/mvme68k/conf/VME162
@@ -1,4 +1,4 @@
-#	$NetBSD: VME162,v 1.21 2005/02/25 13:46:50 simonb Exp $
+#	$NetBSD: VME162,v 1.22 2005/08/19 02:03:52 christos Exp $
 
 include		"arch/mvme68k/conf/std.mvme68k"
 
@@ -52,6 +52,7 @@ options 	COMPAT_AOUT_M68K	# compatibility with NetBSD/m68k a.out
 #options 	COMPAT_15
 #options 	COMPAT_16
 #options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_SUNOS
 #options 	COMPAT_M68K4K	# compatibility with NetBSD/m68k4k binaries
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/mvme68k/conf/VME167 b/sys/arch/mvme68k/conf/VME167
index 258c3f231dd0..301cf2a84062 100644
--- a/sys/arch/mvme68k/conf/VME167
+++ b/sys/arch/mvme68k/conf/VME167
@@ -1,4 +1,4 @@
-#	$NetBSD: VME167,v 1.25 2005/02/25 13:46:50 simonb Exp $
+#	$NetBSD: VME167,v 1.26 2005/08/19 02:03:52 christos Exp $
 
 include		"arch/mvme68k/conf/std.mvme68k"
 
@@ -52,6 +52,7 @@ options 	COMPAT_AOUT_M68K	# compatibility with NetBSD/m68k a.out
 #options 	COMPAT_15
 #options 	COMPAT_16
 #options 	COMPAT_20
+#options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_SUNOS
 #options 	COMPAT_M68K4K	# compatibility with NetBSD/m68k4k binaries
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/mvme68k/conf/VME172 b/sys/arch/mvme68k/conf/VME172
index 1de6031a21a4..2e568a2cd49a 100644
--- a/sys/arch/mvme68k/conf/VME172
+++ b/sys/arch/mvme68k/conf/VME172
@@ -1,4 +1,4 @@
-#	$NetBSD: VME172,v 1.21 2005/02/25 13:46:50 simonb Exp $
+#	$NetBSD: VME172,v 1.22 2005/08/19 02:03:52 christos Exp $
 
 include		"arch/mvme68k/conf/std.mvme68k"
 
@@ -51,6 +51,7 @@ options 	COMPAT_AOUT_M68K	# compatibility with NetBSD/m68k a.out
 #options 	COMPAT_15
 #options 	COMPAT_16
 #options 	COMPAT_20
+#options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_SUNOS
 #options 	COMPAT_M68K4K	# compatibility with NetBSD/m68k4k binaries
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/mvme68k/conf/VME177 b/sys/arch/mvme68k/conf/VME177
index e2e2f196d769..373e48f2dd32 100644
--- a/sys/arch/mvme68k/conf/VME177
+++ b/sys/arch/mvme68k/conf/VME177
@@ -1,4 +1,4 @@
-#	$NetBSD: VME177,v 1.21 2005/02/25 13:46:50 simonb Exp $
+#	$NetBSD: VME177,v 1.22 2005/08/19 02:03:52 christos Exp $
 
 include		"arch/mvme68k/conf/std.mvme68k"
 
@@ -51,6 +51,7 @@ options 	COMPAT_AOUT_M68K	# compatibility with NetBSD/m68k a.out
 #options 	COMPAT_15
 #options 	COMPAT_16
 #options 	COMPAT_20
+#options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_SUNOS
 #options 	COMPAT_M68K4K	# compatibility with NetBSD/m68k4k binaries
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/netwinder/conf/GENERIC b/sys/arch/netwinder/conf/GENERIC
index fa6fa780e81d..ace73daac8d0 100644
--- a/sys/arch/netwinder/conf/GENERIC
+++ b/sys/arch/netwinder/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.66 2005/07/31 04:04:43 yamt Exp $
+# $NetBSD: GENERIC,v 1.67 2005/08/19 02:03:52 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -121,6 +121,7 @@ options 	NFS_BOOT_DHCP
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
diff --git a/sys/arch/news68k/conf/GENERIC b/sys/arch/news68k/conf/GENERIC
index c2d58880a339..2b6a80122b70 100644
--- a/sys/arch/news68k/conf/GENERIC
+++ b/sys/arch/news68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.68 2005/07/31 04:04:43 yamt Exp $
+# $NetBSD: GENERIC,v 1.69 2005/08/19 02:03:52 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/news68k/conf/std.news68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.68 $"
+#ident 		"GENERIC-$Revision: 1.69 $"
 
 maxusers	8
 
@@ -73,6 +73,7 @@ options 	COMPAT_14		# NetBSD 1.4 binary compatibility
 options 	COMPAT_15		# NetBSD 1.5 binary compatibility
 options 	COMPAT_16		# NetBSD 1.6 binary compatibility
 options 	COMPAT_20		# NetBSD 2.0 binary compatibility
+options 	COMPAT_30		# NetBSD 3.0 compatibility.
 options 	COMPAT_AOUT_M68K	# compatibility with NetBSD/m68k a.out
 
 #options 	COMPAT_SVR4		# binary compatibility with SVR4
diff --git a/sys/arch/news68k/conf/GENERIC_TINY b/sys/arch/news68k/conf/GENERIC_TINY
index 893663ecca11..e403802e74bf 100644
--- a/sys/arch/news68k/conf/GENERIC_TINY
+++ b/sys/arch/news68k/conf/GENERIC_TINY
@@ -1,4 +1,4 @@
-# 	$NetBSD: GENERIC_TINY,v 1.42 2005/07/31 04:04:43 yamt Exp $
+# 	$NetBSD: GENERIC_TINY,v 1.43 2005/08/19 02:03:52 christos Exp $
 
 #	news68k GENERIC config file for low memory machines;
 #
@@ -6,7 +6,7 @@ include		"arch/news68k/conf/std.news68k"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC_TINY-$Revision: 1.42 $"
+#ident 		"GENERIC_TINY-$Revision: 1.43 $"
 
 maxusers	4
 
@@ -58,6 +58,7 @@ options 	COMPAT_14		# NetBSD 1.4 binary compatibility
 options 	COMPAT_15		# NetBSD 1.5 binary compatibility
 options 	COMPAT_16		# NetBSD 1.6 binary compatibility
 options 	COMPAT_20		# NetBSD 2.0 binary compatibility
+options 	COMPAT_30		# NetBSD 3.0 compatibility.
 options 	COMPAT_AOUT_M68K	# compatibility with NetBSD/m68k a.out
 
 #options 	COMPAT_SVR4		# binary compatibility with SVR4
diff --git a/sys/arch/news68k/conf/INSTALL b/sys/arch/news68k/conf/INSTALL
index c3e1eafb0baf..846a2617f5a3 100644
--- a/sys/arch/news68k/conf/INSTALL
+++ b/sys/arch/news68k/conf/INSTALL
@@ -1,4 +1,4 @@
-# 	$NetBSD: INSTALL,v 1.31 2005/02/18 21:05:53 dsl Exp $
+# 	$NetBSD: INSTALL,v 1.32 2005/08/19 02:03:52 christos Exp $
 
 #	config for bootable floppy kernel
 #
@@ -46,6 +46,7 @@ options 	MALLOC_NOINLINE		# Not inlining MALLOC saves memory
 #options 	COMPAT_15		# NetBSD 1.5 binary compatibility
 #options 	COMPAT_16		# NetBSD 1.6 binary compatibility
 #options 	COMPAT_20		# NetBSD 2.0 binary compatibility
+#options 	COMPAT_30		# NetBSD 3.0 compatibility.
 options 	COMPAT_BSDPTY		# /dev/[pt]ty?? ptys.
 
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/news68k/conf/LIBERO b/sys/arch/news68k/conf/LIBERO
index 2486f29db316..e2bc4a2da0ad 100644
--- a/sys/arch/news68k/conf/LIBERO
+++ b/sys/arch/news68k/conf/LIBERO
@@ -1,4 +1,4 @@
-# 	$NetBSD: LIBERO,v 1.33 2005/07/31 04:04:43 yamt Exp $
+# 	$NetBSD: LIBERO,v 1.34 2005/08/19 02:03:52 christos Exp $
 
 #	NEWS1750 config file;
 #
@@ -46,6 +46,7 @@ options 	COMPAT_13		# NetBSD 1.3 binary compatibility
 options 	COMPAT_14		# NetBSD 1.4 binary compatibility
 options 	COMPAT_16		# NetBSD 1.6 binary compatibility
 options 	COMPAT_20		# NetBSD 2.0 binary compatibility
+options 	COMPAT_30		# NetBSD 3.0 compatibility.
 options 	COMPAT_AOUT_M68K	# compatibility with NetBSD/m68k a.out
 
 #options 	COMPAT_SVR4		# binary compatibility with SVR4
diff --git a/sys/arch/news68k/conf/NEWS1200 b/sys/arch/news68k/conf/NEWS1200
index 8240d530c966..8c3f06c24e19 100644
--- a/sys/arch/news68k/conf/NEWS1200
+++ b/sys/arch/news68k/conf/NEWS1200
@@ -1,4 +1,4 @@
-# 	$NetBSD: NEWS1200,v 1.32 2005/07/31 04:04:43 yamt Exp $
+# 	$NetBSD: NEWS1200,v 1.33 2005/08/19 02:03:52 christos Exp $
 
 #	news1200 config file
 #
@@ -43,6 +43,7 @@ options 	COMPAT_14		# NetBSD 1.4 binary compatibility
 options 	COMPAT_15		# NetBSD 1.5 binary compatibility
 options 	COMPAT_16		# NetBSD 1.6 binary compatibility
 options 	COMPAT_20		# NetBSD 2.0 binary compatibility
+options 	COMPAT_30		# NetBSD 3.0 compatibility.
 options 	COMPAT_AOUT_M68K	# compatibility with NetBSD/m68k a.out
 
 #options 	COMPAT_SVR4		# binary compatibility with SVR4
diff --git a/sys/arch/newsmips/conf/DEJIKO b/sys/arch/newsmips/conf/DEJIKO
index 5a7099cecf07..d31f5c333eca 100644
--- a/sys/arch/newsmips/conf/DEJIKO
+++ b/sys/arch/newsmips/conf/DEJIKO
@@ -1,4 +1,4 @@
-# 	$NetBSD: DEJIKO,v 1.17 2005/07/31 04:04:43 yamt Exp $
+# 	$NetBSD: DEJIKO,v 1.18 2005/08/19 02:03:52 christos Exp $
 #
 #	Dejiko's sekai-seifuku NEWS5000 nyo.
 
@@ -39,6 +39,7 @@ options 	COMPAT_43		# compatibility with 4.3BSD binaries
 options 	COMPAT_14		# NetBSD 1.4 binary compatibility
 options 	COMPAT_16		# NetBSD 1.6 binary compatibility
 options 	COMPAT_20		# NetBSD 2.0 binary compatibility
+options 	COMPAT_30		# NetBSD 3.0 compatibility.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 # wscons options
diff --git a/sys/arch/newsmips/conf/GENERIC b/sys/arch/newsmips/conf/GENERIC
index 179b756a3186..7b959eb5ce94 100644
--- a/sys/arch/newsmips/conf/GENERIC
+++ b/sys/arch/newsmips/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.82 2005/07/31 04:04:43 yamt Exp $
+# $NetBSD: GENERIC,v 1.83 2005/08/19 02:03:52 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/newsmips/conf/std.newsmips"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.82 $"
+#ident 		"GENERIC-$Revision: 1.83 $"
 
 maxusers	16
 
@@ -71,6 +71,7 @@ options 	COMPAT_13	# NetBSD 1.3 binary compatibility
 options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 #options 	EXEC_AOUT	# exec a.out binaries
 #options 	EXEC_ECOFF	# exec ecoff binaries
diff --git a/sys/arch/newsmips/conf/INSTALL b/sys/arch/newsmips/conf/INSTALL
index 73f27d80d57f..07c8c800323d 100644
--- a/sys/arch/newsmips/conf/INSTALL
+++ b/sys/arch/newsmips/conf/INSTALL
@@ -1,4 +1,4 @@
-# 	$NetBSD: INSTALL,v 1.25 2005/02/18 21:05:53 dsl Exp $
+# 	$NetBSD: INSTALL,v 1.26 2005/08/19 02:03:52 christos Exp $
 #
 #	INSTALL kernel for RISC-NEWS
 
@@ -33,6 +33,7 @@ options 	MALLOC_NOINLINE		# Not inlining MALLOC saves memory
 options 	COMPAT_14		# NetBSD 1.4 binary compatibility
 options 	COMPAT_16		# NetBSD 1.6 binary compatibility
 options 	COMPAT_20		# NetBSD 2.0 binary compatibility
+options 	COMPAT_30		# NetBSD 3.0 compatibility.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
 # Filesystems
diff --git a/sys/arch/newsmips/conf/WAPIKO b/sys/arch/newsmips/conf/WAPIKO
index 18f9714d5b56..d2d81f4b35fb 100644
--- a/sys/arch/newsmips/conf/WAPIKO
+++ b/sys/arch/newsmips/conf/WAPIKO
@@ -1,7 +1,7 @@
 #
 # NEWS3400 config file
 #
-# 	$NetBSD: WAPIKO,v 1.29 2005/07/31 04:04:43 yamt Exp $
+# 	$NetBSD: WAPIKO,v 1.30 2005/08/19 02:03:52 christos Exp $
 #
 include		"arch/newsmips/conf/std.newsmips"
 
@@ -35,6 +35,7 @@ options 	COMPAT_13		# NetBSD 1.3 binary compatibility
 options 	COMPAT_14		# NetBSD 1.4 binary compatibility
 options 	COMPAT_16		# NetBSD 1.6 binary compatibility
 options 	COMPAT_20		# NetBSD 2.0 binary compatibility
+options 	COMPAT_30		# NetBSD 3.0 compatibility.
 #options 	EXEC_AOUT		# exec a.out binaries
 #options 	EXEC_ECOFF		# exec ecoff binaries
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/next68k/conf/GENERIC b/sys/arch/next68k/conf/GENERIC
index 5f12e31e46ff..8485a2d7bb6f 100644
--- a/sys/arch/next68k/conf/GENERIC
+++ b/sys/arch/next68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.92 2005/07/31 04:04:43 yamt Exp $
+# $NetBSD: GENERIC,v 1.93 2005/08/19 02:03:52 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/next68k/conf/std.next68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.92 $"
+#ident 		"GENERIC-$Revision: 1.93 $"
 
 # Needs to be set per system.  i.e change these as you see fit
 maxusers	16
@@ -83,6 +83,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
diff --git a/sys/arch/next68k/conf/SLAB b/sys/arch/next68k/conf/SLAB
index fb2647b76081..7aaf5f384615 100644
--- a/sys/arch/next68k/conf/SLAB
+++ b/sys/arch/next68k/conf/SLAB
@@ -1,4 +1,4 @@
-# $NetBSD: SLAB,v 1.28 2005/07/31 04:04:43 yamt Exp $
+# $NetBSD: SLAB,v 1.29 2005/08/19 02:03:52 christos Exp $
 #
 # deberg's development machine
 #
@@ -57,6 +57,7 @@ options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_15	# NetBSD 1.5
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 
 #options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
 
diff --git a/sys/arch/ofppc/conf/BRIQ b/sys/arch/ofppc/conf/BRIQ
index fc0b08471cd2..e8783719825d 100644
--- a/sys/arch/ofppc/conf/BRIQ
+++ b/sys/arch/ofppc/conf/BRIQ
@@ -1,4 +1,4 @@
-#	$NetBSD: BRIQ,v 1.21 2005/07/31 04:04:43 yamt Exp $
+#	$NetBSD: BRIQ,v 1.22 2005/08/19 02:03:52 christos Exp $
 #
 #	BRIQ -- Total Impact briQ -- http://www.totalimpact.com
 #
@@ -7,7 +7,7 @@ include "arch/ofppc/conf/std.ofppc"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.21 $"
+#ident 		"GENERIC-$Revision: 1.22 $"
 
 maxusers	32
 
@@ -56,6 +56,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	COMPAT_LINUX	# Linux binary compatibility
diff --git a/sys/arch/ofppc/conf/GENERIC b/sys/arch/ofppc/conf/GENERIC
index 1cca476bc0c1..b63f72874db7 100644
--- a/sys/arch/ofppc/conf/GENERIC
+++ b/sys/arch/ofppc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.81 2005/07/31 04:04:43 yamt Exp $
+# $NetBSD: GENERIC,v 1.82 2005/08/19 02:03:52 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/ofppc/conf/std.ofppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.81 $"
+#ident 		"GENERIC-$Revision: 1.82 $"
 
 maxusers	32
 
@@ -69,6 +69,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	COMPAT_LINUX	# Linux binary compatibility
diff --git a/sys/arch/pc532/conf/BULLBOX b/sys/arch/pc532/conf/BULLBOX
index 1eb7436fb564..8286a93911c0 100644
--- a/sys/arch/pc532/conf/BULLBOX
+++ b/sys/arch/pc532/conf/BULLBOX
@@ -1,4 +1,4 @@
-#	$NetBSD: BULLBOX,v 1.22 2005/07/31 04:04:43 yamt Exp $
+#	$NetBSD: BULLBOX,v 1.23 2005/08/19 02:03:53 christos Exp $
 #
 # BULLBOX: Kernel for Jon Buller's machine
 #
@@ -31,6 +31,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/pc532/conf/DUMMY b/sys/arch/pc532/conf/DUMMY
index eeeff08610c8..05b767138e41 100644
--- a/sys/arch/pc532/conf/DUMMY
+++ b/sys/arch/pc532/conf/DUMMY
@@ -1,4 +1,4 @@
-#	$NetBSD: DUMMY,v 1.29 2005/07/31 04:04:43 yamt Exp $
+#	$NetBSD: DUMMY,v 1.30 2005/08/19 02:03:53 christos Exp $
 #
 # DUMMY: Matthias Pfaller's second pc532
 #
@@ -40,6 +40,7 @@ options 	COMPAT_13		# NetBSD 1.3,
 options 	COMPAT_14		# NetBSD 1.4,
 options 	COMPAT_16		# NetBSD 1.6,
 options 	COMPAT_20		# NetBSD 2.0,
+options 	COMPAT_30		# NetBSD 3.0 compatibility.
 options 	COMPAT_43		# and 4.3BSD
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
diff --git a/sys/arch/pc532/conf/GENERIC b/sys/arch/pc532/conf/GENERIC
index 7f7ebabfe0af..da843fea7707 100644
--- a/sys/arch/pc532/conf/GENERIC
+++ b/sys/arch/pc532/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.53 2005/07/31 04:04:43 yamt Exp $
+# $NetBSD: GENERIC,v 1.54 2005/08/19 02:03:53 christos Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/pc532/conf/std.pc532"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.53 $"
+#ident 		"GENERIC-$Revision: 1.54 $"
 
 maxusers	8			# estimated number of users
 
@@ -55,6 +55,7 @@ options 	COMPAT_13	# NetBSD 1.3,
 options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/pc532/conf/KLONDIKE b/sys/arch/pc532/conf/KLONDIKE
index 87c84d4b451e..22134e5ccf67 100644
--- a/sys/arch/pc532/conf/KLONDIKE
+++ b/sys/arch/pc532/conf/KLONDIKE
@@ -1,5 +1,5 @@
 
-#	$NetBSD: KLONDIKE,v 1.33 2005/07/31 04:04:43 yamt Exp $
+#	$NetBSD: KLONDIKE,v 1.34 2005/08/19 02:03:53 christos Exp $
 #
 # KLONDIKE: Matthias Pfaller's pc532
 #
@@ -39,6 +39,7 @@ options 	COMPAT_13		# NetBSD 1.3
 options 	COMPAT_14		# NetBSD 1.4,
 options 	COMPAT_16		# NetBSD 1.6,
 options 	COMPAT_20		# NetBSD 2.0,
+options 	COMPAT_30		# NetBSD 3.0 compatibility.
 options 	COMPAT_43		# and 4.3BSD
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
diff --git a/sys/arch/pc532/conf/SALMON b/sys/arch/pc532/conf/SALMON
index 3bec79dbfec4..eaf3c7667db2 100644
--- a/sys/arch/pc532/conf/SALMON
+++ b/sys/arch/pc532/conf/SALMON
@@ -1,4 +1,4 @@
-#	$NetBSD: SALMON,v 1.26 2005/07/31 04:04:43 yamt Exp $
+#	$NetBSD: SALMON,v 1.27 2005/08/19 02:03:53 christos Exp $
 #
 # SALMON: Phil Nelson's 2nd (test) pc532
 #
@@ -31,6 +31,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
diff --git a/sys/arch/pc532/conf/STEELHEAD b/sys/arch/pc532/conf/STEELHEAD
index 4cf7c4bba38b..40f3c85b6f61 100644
--- a/sys/arch/pc532/conf/STEELHEAD
+++ b/sys/arch/pc532/conf/STEELHEAD
@@ -1,4 +1,4 @@
-#	$NetBSD: STEELHEAD,v 1.41 2005/07/31 04:04:43 yamt Exp $
+#	$NetBSD: STEELHEAD,v 1.42 2005/08/19 02:03:53 christos Exp $
 #
 # STEELHEAD: Phil Nelson's pc532
 #
@@ -31,6 +31,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC
index 8bf365d38fc7..5ce33f1d6372 100644
--- a/sys/arch/pmax/conf/GENERIC
+++ b/sys/arch/pmax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.133 2005/07/31 04:04:43 yamt Exp $
+# $NetBSD: GENERIC,v 1.134 2005/08/19 02:03:53 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -23,7 +23,7 @@ include		"arch/pmax/conf/files.pmax_rcons"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.133 $"
+#ident		"GENERIC-$Revision: 1.134 $"
 
 maxusers	64
 
@@ -154,6 +154,7 @@ options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
diff --git a/sys/arch/pmax/conf/WSCONS b/sys/arch/pmax/conf/WSCONS
index 777739941954..18df3a703598 100644
--- a/sys/arch/pmax/conf/WSCONS
+++ b/sys/arch/pmax/conf/WSCONS
@@ -1,4 +1,4 @@
-# $NetBSD: WSCONS,v 1.15 2005/07/31 04:04:43 yamt Exp $
+# $NetBSD: WSCONS,v 1.16 2005/08/19 02:03:53 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -33,7 +33,7 @@ options 	WSCONS
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.15 $"
+#ident		"GENERIC-$Revision: 1.16 $"
 
 maxusers	64
 
@@ -148,6 +148,7 @@ options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
diff --git a/sys/arch/pmppc/conf/INSTALL b/sys/arch/pmppc/conf/INSTALL
index 40dc136bdf2f..7f73ab0b27d9 100644
--- a/sys/arch/pmppc/conf/INSTALL
+++ b/sys/arch/pmppc/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.17 2005/07/07 17:05:58 tron Exp $
+#	$NetBSD: INSTALL,v 1.18 2005/08/19 02:03:53 christos Exp $
 #
 #	INSTALL
 #
@@ -57,6 +57,7 @@ no makeoptions	NEED_SYMTAB
 #options 	COMPAT_14	# NetBSD 1.4,
 #options 	COMPAT_16	# NetBSD 1.6,
 #options 	COMPAT_20	# NetBSD 2.0,
+#options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/pmppc/conf/PMPPC b/sys/arch/pmppc/conf/PMPPC
index 9ed23e650cc1..4be38bfb3fdc 100644
--- a/sys/arch/pmppc/conf/PMPPC
+++ b/sys/arch/pmppc/conf/PMPPC
@@ -1,4 +1,4 @@
-#	$NetBSD: PMPPC,v 1.30 2005/08/05 09:23:17 skrll Exp $
+#	$NetBSD: PMPPC,v 1.31 2005/08/19 02:03:53 christos Exp $
 #
 #	PMPPC
 #
@@ -51,6 +51,7 @@ options 	SYMTAB_SPACE=450000	# size for embedded symbol table
 #options 	COMPAT_14	# NetBSD 1.4,
 #options 	COMPAT_16	# NetBSD 1.6,
 #options 	COMPAT_20	# NetBSD 2.0,
+#options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_386BSD_MBRPART # recognize old partition ID
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/prep/conf/GENERIC b/sys/arch/prep/conf/GENERIC
index 18fe83ac97fd..7fefa8792fec 100644
--- a/sys/arch/prep/conf/GENERIC
+++ b/sys/arch/prep/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.99 2005/08/05 09:23:17 skrll Exp $
+# $NetBSD: GENERIC,v 1.100 2005/08/19 02:03:53 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -24,7 +24,7 @@ options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
 makeoptions	COPTS="-Os -mmultiple"	# -Os -mmultiple to reduce size.
 
-#ident		"GENERIC-$Revision: 1.99 $"
+#ident		"GENERIC-$Revision: 1.100 $"
 
 maxusers	32
 
@@ -81,6 +81,7 @@ options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_15	# NetBSD 1.5,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 #options 	COMPAT_LINUX	# Linux binary compatibility
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/prep/conf/NATSUMI b/sys/arch/prep/conf/NATSUMI
index 250d79a95111..ba0e3e592386 100644
--- a/sys/arch/prep/conf/NATSUMI
+++ b/sys/arch/prep/conf/NATSUMI
@@ -1,4 +1,4 @@
-#	$NetBSD: NATSUMI,v 1.39 2005/08/05 09:23:17 skrll Exp $
+#	$NetBSD: NATSUMI,v 1.40 2005/08/19 02:03:53 christos Exp $
 #
 #	for development
 #
@@ -50,6 +50,7 @@ options 	COMPAT_14	# NetBSD 1.4,
 options 	COMPAT_15	# NetBSD 1.5,
 options 	COMPAT_16	# NetBSD 1.6,
 options 	COMPAT_20	# NetBSD 2.0,
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# and 4.3BSD
 
 options 	COMPAT_LINUX	# binary compatibility with Linux
diff --git a/sys/arch/sandpoint/conf/GENERIC.sandpoint b/sys/arch/sandpoint/conf/GENERIC.sandpoint
index 8053a7661845..01095bb291e6 100644
--- a/sys/arch/sandpoint/conf/GENERIC.sandpoint
+++ b/sys/arch/sandpoint/conf/GENERIC.sandpoint
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.sandpoint,v 1.24 2005/07/17 00:08:29 hubertf Exp $
+# $NetBSD: GENERIC.sandpoint,v 1.25 2005/08/19 02:03:53 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/sandpoint/conf/std.sandpoint"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.24 $"
+#ident 		"GENERIC-$Revision: 1.25 $"
 
 maxusers	32
 
@@ -54,6 +54,7 @@ options 	COMPAT_13
 options 	COMPAT_14
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_386BSD_MBRPART	# recognize old partition ID
 #options 	COMPAT_LINUX		# Linux binary compatibility
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/sbmips/conf/GENERIC b/sys/arch/sbmips/conf/GENERIC
index 0d85cea48de7..5f3b8f0aed1a 100644
--- a/sys/arch/sbmips/conf/GENERIC
+++ b/sys/arch/sbmips/conf/GENERIC
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.42 2005/07/31 04:04:44 yamt Exp $
+# $NetBSD: GENERIC,v 1.43 2005/08/19 02:03:53 christos Exp $
 
 include 	"arch/sbmips/conf/std.sbmips"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.42 $"
+#ident 		"GENERIC-$Revision: 1.43 $"
 
 #options 	LOCKDEBUG	# XXX XXX XXX XXX
 options 	DEBUG		# extra kernel debugging support
@@ -48,6 +48,7 @@ options 	COMPAT_43	# compatibility with 4.3BSD binaries
 #options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	EXEC_ECOFF	# exec ECOFF binaries
 #options 	COMPAT_ULTRIX	# binary compatibility with Ultrix
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP2x b/sys/arch/sgimips/conf/GENERIC32_IP2x
index 704e07cb8479..e9c82b5bf24a 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP2x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP2x
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP2x,v 1.36 2005/07/31 04:04:44 yamt Exp $
+#	$NetBSD: GENERIC32_IP2x,v 1.37 2005/08/19 02:03:53 christos Exp $
 #
 # GENERIC32_IP2x machine description file
 # 
@@ -29,7 +29,7 @@ makeoptions	TEXTADDR=0x88069000	# entry point
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32-IP2x-$Revision: 1.36 $"
+#ident		"GENERIC32-IP2x-$Revision: 1.37 $"
 
 maxusers	32
 
@@ -88,6 +88,7 @@ options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	COMPAT_15	# NetBSD 1.5
 options		COMPAT_16	# NetBSD 1.6
 options		COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
 options 	COMPAT_IRIX	# binary compatibility with IRIX
diff --git a/sys/arch/sgimips/conf/GENERIC32_IP3x b/sys/arch/sgimips/conf/GENERIC32_IP3x
index d76dd9abe673..dc3e94ca5335 100644
--- a/sys/arch/sgimips/conf/GENERIC32_IP3x
+++ b/sys/arch/sgimips/conf/GENERIC32_IP3x
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP3x,v 1.32 2005/08/05 09:23:17 skrll Exp $
+#	$NetBSD: GENERIC32_IP3x,v 1.33 2005/08/19 02:03:53 christos Exp $
 #
 # GENERIC32_IP3x machine description file
 # 
@@ -28,7 +28,7 @@ makeoptions	TEXTADDR="0x80069000"	# entry point
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32_IP3x-$Revision: 1.32 $"
+#ident		"GENERIC32_IP3x-$Revision: 1.33 $"
 
 maxusers	32
 
@@ -80,6 +80,7 @@ options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	COMPAT_15	# NetBSD 1.5
 options		COMPAT_16	# NetBSD 1.6
 options		COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
 options 	COMPAT_IRIX	# binary compatibility with IRIX
diff --git a/sys/arch/shark/conf/GENERIC b/sys/arch/shark/conf/GENERIC
index f4f5293edcde..b0a2475120fb 100644
--- a/sys/arch/shark/conf/GENERIC
+++ b/sys/arch/shark/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.49 2005/07/31 04:04:46 yamt Exp $
+#	$NetBSD: GENERIC,v 1.50 2005/08/19 02:03:53 christos Exp $
 #
 # Generic Shark configuration.
 #
@@ -7,7 +7,7 @@ include	"arch/shark/conf/std.shark"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.49 $"
+#ident		"GENERIC-$Revision: 1.50 $"
 
 # estimated number of users
 maxusers	32
@@ -118,6 +118,7 @@ options 	COMPAT_14	# NetBSD 1.4 compatibility.
 options 	COMPAT_15	# NetBSD 1.5 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_43	# 4.3BSD compatibility.
 options 	COMPAT_LINUX	# Linux compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/shark/conf/INSTALL b/sys/arch/shark/conf/INSTALL
index db9f08c639e7..a29075fe224e 100644
--- a/sys/arch/shark/conf/INSTALL
+++ b/sys/arch/shark/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.20 2005/02/25 13:46:51 simonb Exp $
+#	$NetBSD: INSTALL,v 1.21 2005/08/19 02:03:53 christos Exp $
 #
 #	Shark installation kernel
 #
@@ -88,6 +88,7 @@ options 	NFS_BOOT_DHCP	# use NetBSD standard DHCP/NFS boot code
 # Compatibility options
 
 #options 	COMPAT_43	# 4.3BSD compatibility.
+#options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_20	# NetBSD 2.0 compatibility.
 #options 	COMPAT_16	# NetBSD 1.6 compatibility.
 #options 	COMPAT_14	# NetBSD 1.4 compatibility.
diff --git a/sys/arch/shark/conf/OFWGENCFG b/sys/arch/shark/conf/OFWGENCFG
index f67ef38b30af..7008f112d7d1 100644
--- a/sys/arch/shark/conf/OFWGENCFG
+++ b/sys/arch/shark/conf/OFWGENCFG
@@ -1,4 +1,4 @@
-#	$NetBSD: OFWGENCFG,v 1.20 2005/07/31 04:04:46 yamt Exp $
+#	$NetBSD: OFWGENCFG,v 1.21 2005/08/19 02:03:53 christos Exp $
 #
 #	OFWGENCFG: 'generic' configuration for Open Firmware boards.
 #
@@ -77,6 +77,7 @@ options 	INET		# IP + ICMP + TCP + UDP
 # Compatibility options
 
 options 	COMPAT_43	# 4.3BSD compatibility.
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_20	# NetBSD 2.0 compatibility.
 options 	COMPAT_16	# NetBSD 1.6 compatibility.
 options 	COMPAT_12	# NetBSD 1.2 compatibility.
diff --git a/sys/arch/sparc/conf/BILL-THE-CAT b/sys/arch/sparc/conf/BILL-THE-CAT
index 015f270ff52f..5dffc93c075c 100644
--- a/sys/arch/sparc/conf/BILL-THE-CAT
+++ b/sys/arch/sparc/conf/BILL-THE-CAT
@@ -1,4 +1,4 @@
-# 	$NetBSD: BILL-THE-CAT,v 1.33 2005/07/31 04:04:46 yamt Exp $
+# 	$NetBSD: BILL-THE-CAT,v 1.34 2005/08/19 02:03:53 christos Exp $
 # 	From: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
 
 include "arch/sparc/conf/std.sparc"
@@ -132,6 +132,7 @@ options 	COMPAT_13	# NetBSD 1.3 binary compatibility
 options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
 options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 305724cb2d89..adecbdead459 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.177 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: GENERIC,v 1.178 2005/08/19 02:03:53 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/sparc/conf/std.sparc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.177 $"
+#ident 		"GENERIC-$Revision: 1.178 $"
 
 maxusers	32
 
@@ -167,6 +167,7 @@ options 	COMPAT_13	# NetBSD 1.3 binary compatibility
 options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
 options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sparc/conf/INSTALL b/sys/arch/sparc/conf/INSTALL
index aa53231057d7..836bf99f5e54 100644
--- a/sys/arch/sparc/conf/INSTALL
+++ b/sys/arch/sparc/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.48 2005/02/25 13:46:51 simonb Exp $
+#	$NetBSD: INSTALL,v 1.49 2005/08/19 02:03:53 christos Exp $
 #
 # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp
 #
@@ -148,6 +148,7 @@ options 	INSECURE
 #options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 #options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 #options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+#options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
 #options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/sparc/conf/KRUPS b/sys/arch/sparc/conf/KRUPS
index 1fd60a09b7fd..55001c836228 100644
--- a/sys/arch/sparc/conf/KRUPS
+++ b/sys/arch/sparc/conf/KRUPS
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.29 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: KRUPS,v 1.30 2005/08/19 02:03:53 christos Exp $
 # From: NetBSD: GENERIC,v 1.160 2004/07/10 12:05:35 uwe Exp
 #
 # Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include 	"arch/sparc/conf/std.sparc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"KRUPS-$Revision: 1.29 $"
+#ident 		"KRUPS-$Revision: 1.30 $"
 
 maxusers	32
 
@@ -168,6 +168,7 @@ options 	COMPAT_13	# NetBSD 1.3 binary compatibility
 options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
 options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sparc/conf/MRCOFFEE b/sys/arch/sparc/conf/MRCOFFEE
index e679ebe08b93..3bf6544b841d 100644
--- a/sys/arch/sparc/conf/MRCOFFEE
+++ b/sys/arch/sparc/conf/MRCOFFEE
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.11 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: MRCOFFEE,v 1.12 2005/08/19 02:03:53 christos Exp $
 # From: NetBSD: GENERIC,v 1.160 2004/07/10 12:05:35 uwe Exp
 #
 # Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@ include 	"arch/sparc/conf/std.sparc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"MRCOFFEE-$Revision: 1.11 $"
+#ident 		"MRCOFFEE-$Revision: 1.12 $"
 
 maxusers	32
 
@@ -156,6 +156,7 @@ options 	COMPAT_13	# NetBSD 1.3 binary compatibility
 options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
 options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sparc/conf/TADPOLE3GX b/sys/arch/sparc/conf/TADPOLE3GX
index 9de97c437848..78562c7b6257 100644
--- a/sys/arch/sparc/conf/TADPOLE3GX
+++ b/sys/arch/sparc/conf/TADPOLE3GX
@@ -1,4 +1,4 @@
-# 	$NetBSD: TADPOLE3GX,v 1.30 2005/07/31 04:04:46 yamt Exp $
+# 	$NetBSD: TADPOLE3GX,v 1.31 2005/08/19 02:03:53 christos Exp $
 
 include "arch/sparc/conf/std.sparc"
 
@@ -127,6 +127,7 @@ options 	COMPAT_13	# NetBSD 1.3 binary compatibility
 options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
 options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
diff --git a/sys/arch/sparc64/conf/GENERIC32 b/sys/arch/sparc64/conf/GENERIC32
index e6df2d0dddc2..d5e1d0f2a582 100644
--- a/sys/arch/sparc64/conf/GENERIC32
+++ b/sys/arch/sparc64/conf/GENERIC32
@@ -1,10 +1,10 @@
-# 	$NetBSD: GENERIC32,v 1.115 2005/08/05 09:23:17 skrll Exp $
+# 	$NetBSD: GENERIC32,v 1.116 2005/08/19 02:03:53 christos Exp $
 
 include "arch/sparc64/conf/std.sparc64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.115 $"
+#ident 		"GENERIC-$Revision: 1.116 $"
 
 maxusers	64
 
@@ -135,6 +135,7 @@ options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_15	# NetBSD 1.5 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 binary compatibility
 options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
 options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
 #options 	COMPAT_SVR4_32	# SunOS 5.x 32-bit binary compatibility -- 64-bit only
diff --git a/sys/arch/sparc64/conf/NONPLUS b/sys/arch/sparc64/conf/NONPLUS
index e4f5db9153f2..9694dbbb4dbd 100644
--- a/sys/arch/sparc64/conf/NONPLUS
+++ b/sys/arch/sparc64/conf/NONPLUS
@@ -1,4 +1,4 @@
-# 	$NetBSD: NONPLUS,v 1.52 2005/07/31 04:04:46 yamt Exp $
+# 	$NetBSD: NONPLUS,v 1.53 2005/08/19 02:03:53 christos Exp $
 
 include "arch/sparc64/conf/std.sparc64"
 
@@ -118,6 +118,7 @@ options 	COMPAT_13	# NetBSD 1.3 binary compatibility
 options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
 options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
 #options 	COMPAT_NETBSD32	# NetBSD/sparc binary compatibility
diff --git a/sys/arch/sparc64/conf/POWEROFSEVEN.inc b/sys/arch/sparc64/conf/POWEROFSEVEN.inc
index 0ece7fc71d4e..c1ce710b7c04 100644
--- a/sys/arch/sparc64/conf/POWEROFSEVEN.inc
+++ b/sys/arch/sparc64/conf/POWEROFSEVEN.inc
@@ -1,4 +1,4 @@
-# 	$NetBSD: POWEROFSEVEN.inc,v 1.37 2005/07/31 04:04:46 yamt Exp $
+# 	$NetBSD: POWEROFSEVEN.inc,v 1.38 2005/08/19 02:03:53 christos Exp $
 #
 # from: NetBSD: GENERIC32,v 1.13 2001/02/28 00:08:18 mjacob Exp
 #
@@ -120,6 +120,7 @@ options 	COMPAT_13	# NetBSD 1.3 binary compatibility
 options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_SVR4_32	# SunOS 5.x 32-bit binary compatibility -- 64-bit only
 #options 	COMPAT_NETBSD32	# NetBSD/sparc binary compatibility -- 64-bit only
 #options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
diff --git a/sys/arch/sparc64/conf/SPLODE b/sys/arch/sparc64/conf/SPLODE
index 0d17a1c286f8..6c05578765a0 100644
--- a/sys/arch/sparc64/conf/SPLODE
+++ b/sys/arch/sparc64/conf/SPLODE
@@ -1,4 +1,4 @@
-# 	$NetBSD: SPLODE,v 1.38 2005/07/31 04:04:46 yamt Exp $
+# 	$NetBSD: SPLODE,v 1.39 2005/08/19 02:03:53 christos Exp $
 #
 # Configuration for Ultra1, 32 bit mode.
 
@@ -6,7 +6,7 @@ include "arch/sparc64/conf/std.sparc64"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.38 $"
+#ident 		"GENERIC-$Revision: 1.39 $"
 
 maxusers	256
 
@@ -121,6 +121,7 @@ options 	COMPAT_13	# NetBSD 1.3 binary compatibility
 options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility
 options 	COMPAT_SVR4	# SunOS 5.x binary compatibility
 #options 	COMPAT_SVR4_32	# SunOS 5.x 32-bit binary compatibility -- 64-bit only
diff --git a/sys/arch/sun2/conf/DISKLESS b/sys/arch/sun2/conf/DISKLESS
index b5a8419edb5a..adb6aef3185d 100644
--- a/sys/arch/sun2/conf/DISKLESS
+++ b/sys/arch/sun2/conf/DISKLESS
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.23 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: DISKLESS,v 1.24 2005/08/19 02:03:57 christos Exp $
 
 # DISKLESS Sun2 (2/120, 2/170, 2/50, ...)
 # Supports root on: ie0, ec0
@@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"DISKLESS-$Revision: 1.23 $"
+#ident 		"DISKLESS-$Revision: 1.24 $"
 
 # Machines to be supported by this kernel
 #options 	FPU_EMULATE
@@ -50,6 +50,7 @@ options 	COMPAT_43	# and 4.3BSD and ...
 #options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	EXEC_AOUT	# support for a.out executables
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sun2/conf/FOURMEG b/sys/arch/sun2/conf/FOURMEG
index 728f87d1ff3a..8104c1ecf808 100644
--- a/sys/arch/sun2/conf/FOURMEG
+++ b/sys/arch/sun2/conf/FOURMEG
@@ -1,4 +1,4 @@
-# $NetBSD: FOURMEG,v 1.26 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: FOURMEG,v 1.27 2005/08/19 02:03:57 christos Exp $
 
 # FOURMEG Sun2 (2/120, 2/170, 2/50, ...)
 # Supports root on: ie0, sd*, ...
@@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"FOURMEG-$Revision: 1.26 $"
+#ident 		"FOURMEG-$Revision: 1.27 $"
 
 # Machines to be supported by this kernel
 #options 	FPU_EMULATE
@@ -50,6 +50,7 @@ options 	MALLOC_NOINLINE		# Not inlining MALLOC saves memory
 #options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	EXEC_AOUT	# support for a.out executables
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sun2/conf/GENERIC b/sys/arch/sun2/conf/GENERIC
index d06833f3acac..34f931b6429f 100644
--- a/sys/arch/sun2/conf/GENERIC
+++ b/sys/arch/sun2/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.45 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: GENERIC,v 1.46 2005/08/19 02:03:57 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -25,7 +25,7 @@ include 	"arch/sun2/conf/std.sun2"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.45 $"
+#ident 		"GENERIC-$Revision: 1.46 $"
 
 # Machines to be supported by this kernel
 #options 	FPU_EMULATE
@@ -78,6 +78,7 @@ options 	COMPAT_43	# and 4.3BSD and ...
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	EXEC_AOUT	# support for a.out executables
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sun2/conf/VME b/sys/arch/sun2/conf/VME
index ad9594714f02..c36f066d3c4e 100644
--- a/sys/arch/sun2/conf/VME
+++ b/sys/arch/sun2/conf/VME
@@ -1,4 +1,4 @@
-# $NetBSD: VME,v 1.18 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: VME,v 1.19 2005/08/19 02:03:57 christos Exp $
 
 # VME Sun2 (2/50, 2/130, 2/160...)
 # Supports root on: ie0, sd*, ...
@@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"VME-$Revision: 1.18 $"
+#ident 		"VME-$Revision: 1.19 $"
 
 # Machines to be supported by this kernel
 #options 	FPU_EMULATE
@@ -52,6 +52,7 @@ options 	DDB
 options 	COMPAT_43	# and 4.3BSD and ...
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_16
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options 	EXEC_AOUT	# support for a.out executables
diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS
index b0f959ec0646..b674d2388c02 100644
--- a/sys/arch/sun3/conf/DISKLESS
+++ b/sys/arch/sun3/conf/DISKLESS
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.47 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: DISKLESS,v 1.48 2005/08/19 02:03:57 christos Exp $
 
 # DISKLESS - Root and swap on NFS
 # Desktop machines only (3/50, 3/60, 3/110)
@@ -52,6 +52,7 @@ options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sun3/conf/DISKLESS3X b/sys/arch/sun3/conf/DISKLESS3X
index 948fa55063e1..498d0cbe22e9 100644
--- a/sys/arch/sun3/conf/DISKLESS3X
+++ b/sys/arch/sun3/conf/DISKLESS3X
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS3X,v 1.34 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: DISKLESS3X,v 1.35 2005/08/19 02:03:57 christos Exp $
 
 # DISKLESS - Root and swap on NFS
 # Desktop machines only (3/80)
@@ -52,6 +52,7 @@ options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sun3/conf/FOUR_TTYS b/sys/arch/sun3/conf/FOUR_TTYS
index c08cf6beb804..a355adc6aa94 100644
--- a/sys/arch/sun3/conf/FOUR_TTYS
+++ b/sys/arch/sun3/conf/FOUR_TTYS
@@ -1,4 +1,4 @@
-#	$NetBSD: FOUR_TTYS,v 1.43 2005/07/31 04:04:46 yamt Exp $
+#	$NetBSD: FOUR_TTYS,v 1.44 2005/08/19 02:03:57 christos Exp $
 
 # FOUR_TTYS Sun3 (3/50, 3/60, 3/110, 3/160, 3/260)
 # like GENERIC but both zs chips are used as ttys
@@ -52,6 +52,7 @@ options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 options 	EXEC_AOUT	# support for a.out executables
diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC
index 4fbc85b66df0..8f5da6e0f32a 100644
--- a/sys/arch/sun3/conf/GENERIC
+++ b/sys/arch/sun3/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.120 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: GENERIC,v 1.121 2005/08/19 02:03:57 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -25,7 +25,7 @@ include 	"arch/sun3/conf/std.sun3"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.120 $"
+#ident 		"GENERIC-$Revision: 1.121 $"
 
 # Machines to be supported by this kernel
 options 	FPU_EMULATE
@@ -84,6 +84,7 @@ options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 options 	EXEC_AOUT	# support for a.out executables
diff --git a/sys/arch/sun3/conf/GENERIC3X b/sys/arch/sun3/conf/GENERIC3X
index 4438a0398d08..c4b9a534bc96 100644
--- a/sys/arch/sun3/conf/GENERIC3X
+++ b/sys/arch/sun3/conf/GENERIC3X
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.78 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: GENERIC3X,v 1.79 2005/08/19 02:03:57 christos Exp $
 
 # GENERIC Sun3X (3/80, 3/470)
 # Supports root on: ie0, le0, sd*, ...
@@ -64,6 +64,7 @@ options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 options 	EXEC_AOUT	# support for a.out executables
diff --git a/sys/arch/sun3/conf/INSTALL b/sys/arch/sun3/conf/INSTALL
index 9a89d456b835..da0ac563d880 100644
--- a/sys/arch/sun3/conf/INSTALL
+++ b/sys/arch/sun3/conf/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.28 2005/02/18 21:05:54 dsl Exp $
+# $NetBSD: INSTALL,v 1.29 2005/08/19 02:03:57 christos Exp $
 #
 # INSTALL - Installation kernel for the Sun3
 #
@@ -59,6 +59,7 @@ options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
diff --git a/sys/arch/sun3/conf/INSTALL3X b/sys/arch/sun3/conf/INSTALL3X
index bb49a19d2abe..d8059a6308ef 100644
--- a/sys/arch/sun3/conf/INSTALL3X
+++ b/sys/arch/sun3/conf/INSTALL3X
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL3X,v 1.27 2005/02/18 21:05:54 dsl Exp $
+# $NetBSD: INSTALL3X,v 1.28 2005/08/19 02:03:57 christos Exp $
 #
 # INSTALL3X - Installation kernel for the Sun3X
 #
@@ -59,6 +59,7 @@ options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 #options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
 
diff --git a/sys/arch/sun3/conf/KGDB b/sys/arch/sun3/conf/KGDB
index 87b0dba2975a..91d9d8d7d3d6 100644
--- a/sys/arch/sun3/conf/KGDB
+++ b/sys/arch/sun3/conf/KGDB
@@ -1,4 +1,4 @@
-#	$NetBSD: KGDB,v 1.43 2005/07/31 04:04:46 yamt Exp $
+#	$NetBSD: KGDB,v 1.44 2005/08/19 02:03:57 christos Exp $
 
 # KGDB Sun3 (3/50, 3/60, 3/110, 3/160, 3/260, 3/E)
 # like GENERIC but supports gdb on other machine, i.e.:
@@ -55,6 +55,7 @@ options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 options 	EXEC_AOUT	# support for a.out executables
diff --git a/sys/arch/sun3/conf/KGDB3X b/sys/arch/sun3/conf/KGDB3X
index 74f8a273145a..610c49279e56 100644
--- a/sys/arch/sun3/conf/KGDB3X
+++ b/sys/arch/sun3/conf/KGDB3X
@@ -1,4 +1,4 @@
-# $NetBSD: KGDB3X,v 1.45 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: KGDB3X,v 1.46 2005/08/19 02:03:57 christos Exp $
 
 # KGDB3X Sun3X (3/80, 3/470)
 # like GENERIC but supports gdb on other machine, i.e.:
@@ -55,6 +55,7 @@ options 	COMPAT_13	# NetBSD 1.3
 options 	COMPAT_14	# NetBSD 1.4
 options 	COMPAT_16	# NetBSD 1.6
 options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_AOUT_M68K # support for NetBSD a.out executables
 #options 	COMPAT_LINUX	# can run Linux/m68k executables
 options 	EXEC_AOUT	# support for a.out executables
diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC
index a3fd04dc7a2d..4b80df139f7e 100644
--- a/sys/arch/vax/conf/GENERIC
+++ b/sys/arch/vax/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.138 2005/07/31 04:04:46 yamt Exp $
+# $NetBSD: GENERIC,v 1.139 2005/08/19 02:03:57 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/vax/conf/std.vax"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.138 $"
+#ident 		"GENERIC-$Revision: 1.139 $"
 
 # Here are all different supported CPU types listed.
 #options 	VAX8800		# VAX 8500, 8530, 8550, 8700, 8800
@@ -148,6 +148,7 @@ options 	COMPAT_14
 options 	COMPAT_15
 options 	COMPAT_16
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_ULTRIX
 options 	COMPAT_IBCS2	# DEC SVR.3 compatilibity
 #options 	NO_INSN_EMULATE	# CPU does not lack some hardware instructions.
diff --git a/sys/arch/vax/conf/INSTALL b/sys/arch/vax/conf/INSTALL
index 168d5f0f5e73..ffb461826d4d 100644
--- a/sys/arch/vax/conf/INSTALL
+++ b/sys/arch/vax/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.37 2005/02/25 13:46:51 simonb Exp $
+#	$NetBSD: INSTALL,v 1.38 2005/08/19 02:03:57 christos Exp $
 #
 # INSTALL kernel; all supported devices but nothing fancy.
 #
@@ -95,6 +95,7 @@ options 	WSEMUL_VT100
 options 	COMPAT_14
 options 	COMPAT_15
 options 	COMPAT_20
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_ULTRIX
 options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
 
diff --git a/sys/arch/x68k/conf/GENERIC b/sys/arch/x68k/conf/GENERIC
index 9bfd7d163d9a..3e5b045cbd85 100644
--- a/sys/arch/x68k/conf/GENERIC
+++ b/sys/arch/x68k/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.117 2005/08/05 09:23:17 skrll Exp $
+# $NetBSD: GENERIC,v 1.118 2005/08/19 02:03:57 christos Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/x68k/conf/std.x68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.117 $"
+#ident 		"GENERIC-$Revision: 1.118 $"
 
 maxusers	8
 
@@ -164,6 +164,7 @@ options 	COMPAT_14	# NetBSD 1.4 binary compatibility
 options 	COMPAT_15	# NetBSD 1.5 binary compatibility
 options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 options 	COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
 #options 	COMPAT_M68K4K	# NetBSD/m68k4k binaries
 #options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility; broken
diff --git a/sys/arch/x68k/conf/INSTALL b/sys/arch/x68k/conf/INSTALL
index 700694d671ec..29b3991a010f 100644
--- a/sys/arch/x68k/conf/INSTALL
+++ b/sys/arch/x68k/conf/INSTALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL,v 1.68 2005/07/07 17:05:58 tron Exp $
+#	$NetBSD: INSTALL,v 1.69 2005/08/19 02:03:57 christos Exp $
 
 #
 #	INSTALL -- installation kernel.
@@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"INSTALL-$Revision: 1.68 $"
+#ident 		"INSTALL-$Revision: 1.69 $"
 
 makeoptions	COPTS="-Os"		# Optimise for space. Implies -O2
 
@@ -148,6 +148,7 @@ options 	MALLOC_NOINLINE		# Not inlining MALLOC saves memory
 #options 	COMPAT_15	# NetBSD 1.5 binary compatibility
 #options 	COMPAT_16	# NetBSD 1.6 binary compatibility
 #options 	COMPAT_20	# NetBSD 2.0 binary compatibility
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
 #options 	COMPAT_AOUT_M68K # compatibility with NetBSD/m68k a.out
 #options 	COMPAT_M68K4K	# NetBSD/m68k4k binaries
 #options 	COMPAT_SUNOS	# SunOS 4.x binary compatibility; broken
diff --git a/sys/coda/coda_vnops.c b/sys/coda/coda_vnops.c
index 3848304afbb4..a44037b7f210 100644
--- a/sys/coda/coda_vnops.c
+++ b/sys/coda/coda_vnops.c
@@ -6,7 +6,7 @@ mkdir
 rmdir
 symlink
 */
-/*	$NetBSD: coda_vnops.c,v 1.41 2005/05/29 21:05:25 christos Exp $	*/
+/*	$NetBSD: coda_vnops.c,v 1.42 2005/08/19 02:03:57 christos Exp $	*/
 
 /*
  *
@@ -54,7 +54,7 @@ symlink
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.41 2005/05/29 21:05:25 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.42 2005/08/19 02:03:57 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -256,8 +256,8 @@ coda_open(v)
     if (error)
 	return (error);
     if (!error) {
-	CODADEBUG( CODA_OPEN,myprintf(("open: dev %d inode %d result %d\n",
-				  dev, inode, error)); )
+	CODADEBUG( CODA_OPEN,myprintf(("open: dev %d inode %llu result %d\n",
+				  dev, (unsigned long long)inode, error)); )
     }
 
     /* Translate the <device, inode> pair for the cache file into
@@ -1878,8 +1878,8 @@ coda_grab_vnode(dev_t dev, ino_t ino, struct vnode **vpp)
     /* XXX - ensure that nonzero-return means failure */
     error = VFS_VGET(mp,ino,vpp);
     if (error) {
-	myprintf(("coda_grab_vnode: iget/vget(%d, %d) returns %p, err %d\n",
-		  dev, ino, *vpp, error));
+	myprintf(("coda_grab_vnode: iget/vget(%d, %llu) returns %p, err %d\n",
+		  dev, (unsigned long long)ino, *vpp, error));
 	return(ENOENT);
     }
     return(0);
diff --git a/sys/compat/aoutm68k/aoutm68k_stat.h b/sys/compat/aoutm68k/aoutm68k_stat.h
index 4608edca1704..b3915a429e07 100644
--- a/sys/compat/aoutm68k/aoutm68k_stat.h
+++ b/sys/compat/aoutm68k/aoutm68k_stat.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: aoutm68k_stat.h,v 1.3 2003/06/25 20:30:15 martin Exp $	*/
+/*	$NetBSD: aoutm68k_stat.h,v 1.4 2005/08/19 02:03:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
 #ifdef COMPAT_43
 struct aoutm68k_stat43 {
 	u_int16_t st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
+	u_int32_t st_ino;		/* inode's number */
 	u_int16_t st_mode;		/* inode protection mode */
 	u_int16_t st_nlink;		/* number of hard links */
 	u_int16_t st_uid;		/* user ID of the file's owner */
@@ -68,7 +68,7 @@ struct aoutm68k_stat43 {
 #ifdef COMPAT_12
 struct aoutm68k_stat12 {
 	dev_t	  st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
+	u_int32_t st_ino;		/* inode's number */
 	u_int16_t st_mode;		/* inode protection mode */
 	u_int16_t st_nlink;		/* number of hard links */
 	uid_t	  st_uid;		/* user ID of the file's owner */
@@ -89,7 +89,7 @@ struct aoutm68k_stat12 {
 
 struct aoutm68k_stat {
 	dev_t	  st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
+	u_int32_t st_ino;		/* inode's number */
 	mode_t	  st_mode;		/* inode protection mode */
 	nlink_t	  st_nlink;		/* number of hard links */
 	uid_t	  st_uid;		/* user ID of the file's owner */
diff --git a/sys/compat/common/Makefile b/sys/compat/common/Makefile
index 5e0b15cc9507..c80880e5aa90 100644
--- a/sys/compat/common/Makefile
+++ b/sys/compat/common/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.34 2005/02/26 23:10:18 perry Exp $
+#	$NetBSD: Makefile,v 1.35 2005/08/19 02:03:57 christos Exp $
 
 LIB=		compat
 NOPIC=		# defined
@@ -30,6 +30,9 @@ SRCS+=	sysv_ipc_14.c sysv_msg_14.c sysv_shm_14.c sysv_sem_14.c
 # Compatibility code for NetBSD 2.0
 SRCS+=	vfs_syscalls_20.c
 
+# Compatibility code for NetBSD 3.0
+SRCS+=	vfs_syscalls_30.c
+
 # really, all machines where sizeof(int) != sizeof(long) (LP64)
 .if (${MACHINE_ARCH} != "alpha" && ${MACHINE_ARCH} != "sparc64" \
   && ${MACHINE_ARCH} != "x86_64")
diff --git a/sys/compat/common/compat_file.c b/sys/compat/common/compat_file.c
index 084463ff03a2..b7604d4335d0 100644
--- a/sys/compat/common/compat_file.c
+++ b/sys/compat/common/compat_file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_file.c,v 1.15 2005/05/29 22:08:16 christos Exp $ */
+/*	$NetBSD: compat_file.c,v 1.16 2005/08/19 02:03:57 christos Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_file.c,v 1.15 2005/05/29 22:08:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_file.c,v 1.16 2005/08/19 02:03:57 christos Exp $");
 
 #include "opt_compat_darwin.h"
 #include "opt_nfsserver.h"
@@ -878,12 +878,12 @@ bsd_sys_lutimes(l, v, retval)
 }
 
 int
-bsd_sys___stat13(l, v, retval)
+bsd_sys___stat30(l, v, retval)
 	struct lwp *l;
 	void *v;
 	register_t *retval;
 {
-	struct sys___stat13_args /* {
+	struct sys___stat30_args /* {
 		syscallarg(char *) path;
 		syscallarg(struct stat *) ub;
 	} */ *uap = v;
@@ -891,16 +891,16 @@ bsd_sys___stat13(l, v, retval)
 	caddr_t sg = stackgap_init(p, 0);
 
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
-	return sys___stat13(l, uap, retval);
+	return sys___stat30(l, uap, retval);
 }
 
 int
-bsd_sys___lstat13(l, v, retval)
+bsd_sys___lstat30(l, v, retval)
 	struct lwp *l;
 	void *v;
 	register_t *retval;
 {
-	struct sys___lstat13_args /* {
+	struct sys___lstat30_args /* {
 		syscallarg(char *) path;
 		syscallarg(struct stat *) ub;
 	} */ *uap = v;
@@ -908,7 +908,7 @@ bsd_sys___lstat13(l, v, retval)
 	caddr_t sg = stackgap_init(p, 0);
 
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
-	return sys___lstat13(l, uap, retval);
+	return sys___lstat30(l, uap, retval);
 }
 
 int
diff --git a/sys/compat/common/compat_file.h b/sys/compat/common/compat_file.h
index 2388d1414875..5187648c9818 100644
--- a/sys/compat/common/compat_file.h
+++ b/sys/compat/common/compat_file.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat_file.h,v 1.4 2004/07/24 15:44:09 manu Exp $ */
+/*	$NetBSD: compat_file.h,v 1.5 2005/08/19 02:03:57 christos Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -79,8 +79,8 @@ int bsd_sys_undelete(struct lwp *, void *, register_t *);
 int bsd_sys_lchmod(struct lwp *, void *, register_t *);
 int bsd_sys_lchown(struct lwp *, void *, register_t *);
 int bsd_sys_lutimes(struct lwp *, void *, register_t *);
-int bsd_sys___stat13(struct lwp *, void *, register_t *);
-int bsd_sys___lstat13(struct lwp *, void *, register_t *);
+int bsd_sys___stat30(struct lwp *, void *, register_t *);
+int bsd_sys___lstat30(struct lwp *, void *, register_t *);
 int bsd_sys___posix_chown(struct lwp *, void *, register_t *);
 int bsd_sys___posix_lchown(struct lwp *, void *, register_t *);
 int bsd_sys_lchflags(struct lwp *, void *, register_t *);
diff --git a/sys/compat/common/vfs_syscalls_30.c b/sys/compat/common/vfs_syscalls_30.c
new file mode 100644
index 000000000000..b0d3b572a2c9
--- /dev/null
+++ b/sys/compat/common/vfs_syscalls_30.c
@@ -0,0 +1,310 @@
+/*	$NetBSD: vfs_syscalls_30.c,v 1.1 2005/08/19 02:03:57 christos Exp $	*/
+
+/*-
+ * Copyright (c) 2005 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: vfs_syscalls_30.c,v 1.1 2005/08/19 02:03:57 christos Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/namei.h>
+#include <sys/filedesc.h>
+#include <sys/kernel.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <sys/socketvar.h>
+#include <sys/vnode.h>
+#include <sys/mount.h>
+#include <sys/proc.h>
+#include <sys/uio.h>
+#include <sys/dirent.h>
+#include <sys/malloc.h>
+
+#include <sys/sa.h>
+#include <sys/syscallargs.h>
+
+#include <compat/common/compat_util.h>
+
+static void cvtstat(struct stat13 *, const struct stat *);
+
+/*
+ * Convert from a new to an old stat structure.
+ */
+static void
+cvtstat(struct stat13 *ost, const struct stat *st)
+{
+
+	ost->st_dev = st->st_dev;
+	ost->st_ino = (uint32_t)st->st_ino;
+	ost->st_mode = st->st_mode;
+	ost->st_nlink = st->st_nlink;
+	ost->st_uid = st->st_uid;
+	ost->st_gid = st->st_gid;
+	ost->st_rdev = st->st_rdev;
+	ost->st_atimespec = st->st_atimespec;
+	ost->st_mtimespec = st->st_mtimespec;
+	ost->st_ctimespec = st->st_ctimespec;
+	ost->st_birthtimespec = st->st_birthtimespec;
+	ost->st_size = st->st_size;
+	ost->st_blocks = st->st_blocks;
+	ost->st_blksize = st->st_blksize;
+	ost->st_flags = st->st_flags;
+	ost->st_gen = st->st_gen;
+}
+
+/*
+ * Get file status; this version follows links.
+ */
+/* ARGSUSED */
+int
+compat_30_sys___stat13(struct lwp *l, void *v, register_t *retval)
+{
+	struct compat_30_sys___stat13_args /* {
+		syscallarg(const char *) path;
+		syscallarg(struct stat13 *) ub;
+	} */ *uap = v;
+	struct proc *p = l->l_proc;
+	struct stat sb;
+	struct stat13 osb;
+	int error;
+	struct nameidata nd;
+
+	NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE,
+	    SCARG(uap, path), p);
+	if ((error = namei(&nd)) != 0)
+		return error;
+	error = vn_stat(nd.ni_vp, &sb, p);
+	vput(nd.ni_vp);
+	if (error)
+		return error;
+	cvtstat(&osb, &sb);
+	error = copyout(&osb, SCARG(uap, ub), sizeof (osb));
+	return error;
+}
+
+
+/*
+ * Get file status; this version does not follow links.
+ */
+/* ARGSUSED */
+int
+compat_30_sys___lstat13(struct lwp *l, void *v, register_t *retval)
+{
+	struct compat_30_sys___lstat13_args /* {
+		syscallarg(const char *) path;
+		syscallarg(struct stat13 *) ub;
+	} */ *uap = v;
+	struct proc *p = l->l_proc;
+	struct stat sb;
+	struct stat13 osb;
+	int error;
+	struct nameidata nd;
+
+	NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF, UIO_USERSPACE,
+	    SCARG(uap, path), p);
+	if ((error = namei(&nd)) != 0)
+		return error;
+	error = vn_stat(nd.ni_vp, &sb, p);
+	vput(nd.ni_vp);
+	if (error)
+		return error;
+	cvtstat(&osb, &sb);
+	error = copyout(&osb, SCARG(uap, ub), sizeof (osb));
+	return error;
+}
+
+/*
+ * Return status information about a file descriptor.
+ */
+/* ARGSUSED */
+int
+compat_30_sys___fstat13(struct lwp *l, void *v, register_t *retval)
+{
+	struct compat_30_sys___fstat13_args /* {
+		syscallarg(int) fd;
+		syscallarg(struct stat13 *) sb;
+	} */ *uap = v;
+	struct proc *p = l->l_proc;
+	int fd = SCARG(uap, fd);
+	struct filedesc *fdp = p->p_fd;
+	struct file *fp;
+	struct stat sb;
+	struct stat13 osb;
+	int error;
+
+	if ((fp = fd_getfile(fdp, fd)) == NULL)
+		return EBADF;
+
+	FILE_USE(fp);
+	error = (*fp->f_ops->fo_stat)(fp, &sb, p);
+	FILE_UNUSE(fp, p);
+
+	if (error)
+		return error;
+	cvtstat(&osb, &sb);
+	error = copyout(&osb, SCARG(uap, sb), sizeof (osb));
+	return error;
+}
+
+/*
+ * Read a block of directory entries in a file system independent format.
+ */
+int
+compat_30_sys_getdents(struct lwp *l, void *v, register_t *retval)
+{
+	struct compat_30_sys_getdents_args /* {
+		syscallarg(int) fd;
+		syscallarg(char *) buf;
+		syscallarg(size_t) count;
+	} */ *uap = v;
+	struct proc *p = l->l_proc;
+	struct dirent *bdp;
+	struct vnode *vp;
+	caddr_t inp, tbuf;	/* BSD-format */
+	int len, reclen;	/* BSD-format */
+	caddr_t outp;		/* NetBSD-1.2-format */
+	int resid;	
+	struct file *fp;
+	struct uio auio;
+	struct iovec aiov;
+	struct dirent12 idb;
+	off_t off;		/* true file offset */
+	int buflen, error, eofflag;
+	off_t *cookiebuf = NULL, *cookie;
+	int ncookies;
+
+	/* getvnode() will use the descriptor for us */
+	if ((error = getvnode(p->p_fd, SCARG(uap, fd), &fp)) != 0)
+		return error;
+
+	if ((fp->f_flag & FREAD) == 0) {
+		error = EBADF;
+		goto out1;
+	}
+
+	vp = (struct vnode *)fp->f_data;
+	if (vp->v_type != VDIR) {
+		error = EINVAL;
+		goto out1;
+	}
+
+	buflen = min(MAXBSIZE, SCARG(uap, count));
+	tbuf = malloc(buflen, M_TEMP, M_WAITOK);
+	vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+	off = fp->f_offset;
+again:
+	aiov.iov_base = tbuf;
+	aiov.iov_len = buflen;
+	auio.uio_iov = &aiov;
+	auio.uio_iovcnt = 1;
+	auio.uio_rw = UIO_READ;
+	auio.uio_segflg = UIO_SYSSPACE;
+	auio.uio_procp = NULL;
+	auio.uio_resid = buflen;
+	auio.uio_offset = off;
+	/*
+         * First we read into the malloc'ed buffer, then
+         * we massage it into user space, one record at a time.
+         */
+	error = VOP_READDIR(vp, &auio, fp->f_cred, &eofflag, &cookiebuf,
+	    &ncookies);
+	if (error)
+		goto out;
+
+	inp = tbuf;
+	outp = SCARG(uap, buf);
+	resid = SCARG(uap, count);
+	if ((len = buflen - auio.uio_resid) == 0)
+		goto eof;
+
+	for (cookie = cookiebuf; len > 0; len -= reclen) {
+		bdp = (struct dirent *)inp;
+		reclen = bdp->d_reclen;
+		if (reclen & 0xf)
+			panic("netbsd30_getdents: bad reclen %d", reclen);
+		if (cookie)
+			off = *cookie++; /* each entry points to the next */
+		else
+			off += reclen;
+		if ((off >> 32) != 0) {
+			compat_offseterr(vp, "netbsd12_getdents");
+			error = EINVAL;
+			goto out;
+		}
+		if (bdp->d_namlen >= sizeof(idb.d_name))
+			idb.d_namlen = sizeof(idb.d_name) - 1;
+		else
+			idb.d_namlen = bdp->d_namlen;
+		idb.d_reclen = _DIRENT_SIZE(&idb);
+		if (reclen > len || resid < idb.d_reclen) {
+			/* entry too big for buffer, so just stop */
+			outp++;
+			break;
+		}
+		/*
+		 * Massage in place to make a NetBSD-1.2-shaped dirent
+		 * (otherwise we have to worry about touching user memory
+		 * outside of the copyout() call).
+		 */
+		idb.d_fileno = (u_int32_t)bdp->d_fileno;
+		idb.d_type = bdp->d_type;
+		(void)memcpy(idb.d_name, bdp->d_name, idb.d_namlen);
+		idb.d_name[idb.d_namlen] = '\0';
+		if ((error = copyout(&idb, outp, idb.d_reclen)) != 0)
+			goto out;
+		/* advance past this real entry */
+		inp += reclen;
+		/* advance output past NetBSD-1.2-shaped entry */
+		outp += idb.d_reclen;
+		resid -= idb.d_reclen;
+	}
+
+	/* if we squished out the whole block, try again */
+	if (outp == SCARG(uap, buf))
+		goto again;
+	fp->f_offset = off;	/* update the vnode offset */
+
+eof:
+	*retval = SCARG(uap, count) - resid;
+out:
+	VOP_UNLOCK(vp, 0);
+	if (cookiebuf)
+		free(cookiebuf, M_TEMP);
+	free(tbuf, M_TEMP);
+out1:
+	FILE_UNUSE(fp, p);
+	return error;
+}
diff --git a/sys/compat/darwin/darwin_attr.c b/sys/compat/darwin/darwin_attr.c
index ef0122a767f8..19e106decf1d 100644
--- a/sys/compat/darwin/darwin_attr.c
+++ b/sys/compat/darwin/darwin_attr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: darwin_attr.c,v 1.6 2005/05/29 22:08:16 christos Exp $ */
+/*	$NetBSD: darwin_attr.c,v 1.7 2005/08/19 02:03:57 christos Exp $ */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: darwin_attr.c,v 1.6 2005/05/29 22:08:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: darwin_attr.c,v 1.7 2005/08/19 02:03:57 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -116,7 +116,7 @@ darwin_sys_getattrlist(l, v, retval)
 	darwin_attrreference_t *vol_mountpoint_p = NULL;
 	darwin_attrreference_t *vol_name_p = NULL;
 	darwin_attrreference_t *vol_mounteddevice_p = NULL;
-	struct sys___stat13_args cup1;
+	struct sys___stat30_args cup1;
 	struct stat *ust;
 	struct stat st;
 	struct compat_20_sys_statfs_args cup2;
@@ -163,10 +163,10 @@ darwin_sys_getattrlist(l, v, retval)
 	SCARG(&cup1, path) = path;
 	SCARG(&cup1, ub) = ust;
 	if (follow) {
-		if ((error = sys___stat13(l, &cup1, retval)) != 0)
+		if ((error = sys___stat30(l, &cup1, retval)) != 0)
 			return error;
 	} else {
-		if ((error = sys___lstat13(l, &cup1, retval)) != 0)
+		if ((error = sys___lstat30(l, &cup1, retval)) != 0)
 			return error;
 	}
 
diff --git a/sys/compat/freebsd/freebsd_syscall.h b/sys/compat/freebsd/freebsd_syscall.h
index 509be3fb41c7..d0b6f4b2d88e 100644
--- a/sys/compat/freebsd/freebsd_syscall.h
+++ b/sys/compat/freebsd/freebsd_syscall.h
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_syscall.h,v 1.58 2005/02/26 23:58:19 perry Exp $ */
+/* $NetBSD: freebsd_syscall.h,v 1.59 2005/08/19 02:03:57 christos Exp $ */
 
 /*
  * System call numbers.
@@ -690,13 +690,13 @@
 /* syscall: "__msync13" ret: "int" args: "void *" "size_t" "int" */
 #define	FREEBSD_SYS___msync13	277
 
-/* syscall: "__stat13" ret: "int" args: "const char *" "struct stat *" */
+/* syscall: "__stat13" ret: "int" args: "const char *" "struct stat30 *" */
 #define	FREEBSD_SYS___stat13	278
 
-/* syscall: "__fstat13" ret: "int" args: "int" "struct stat *" */
+/* syscall: "__fstat13" ret: "int" args: "int" "struct stat30 *" */
 #define	FREEBSD_SYS___fstat13	279
 
-/* syscall: "__lstat13" ret: "int" args: "const char *" "struct stat *" */
+/* syscall: "__lstat13" ret: "int" args: "const char *" "struct stat30 *" */
 #define	FREEBSD_SYS___lstat13	280
 
 /* syscall: "fhstatfs" ret: "int" args: "const fhandle_t *" "struct statfs12 *" */
diff --git a/sys/compat/freebsd/freebsd_syscallargs.h b/sys/compat/freebsd/freebsd_syscallargs.h
index 5fccb801bb11..f9c125349f6b 100644
--- a/sys/compat/freebsd/freebsd_syscallargs.h
+++ b/sys/compat/freebsd/freebsd_syscallargs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_syscallargs.h,v 1.60 2005/02/26 23:58:19 perry Exp $ */
+/* $NetBSD: freebsd_syscallargs.h,v 1.61 2005/08/19 02:03:57 christos Exp $ */
 
 /*
  * System call argument lists.
@@ -806,7 +806,7 @@ int	sys_issetugid(struct lwp *, void *, register_t *);
 
 int	freebsd_sys_lchown(struct lwp *, void *, register_t *);
 
-int	sys_getdents(struct lwp *, void *, register_t *);
+int	compat_30_sys_getdents(struct lwp *, void *, register_t *);
 
 int	sys_lchmod(struct lwp *, void *, register_t *);
 
@@ -816,11 +816,11 @@ int	sys_lutimes(struct lwp *, void *, register_t *);
 
 int	sys___msync13(struct lwp *, void *, register_t *);
 
-int	sys___stat13(struct lwp *, void *, register_t *);
+int	compat_30_sys___stat13(struct lwp *, void *, register_t *);
 
-int	sys___fstat13(struct lwp *, void *, register_t *);
+int	compat_30_sys___fstat13(struct lwp *, void *, register_t *);
 
-int	sys___lstat13(struct lwp *, void *, register_t *);
+int	compat_30_sys___lstat13(struct lwp *, void *, register_t *);
 
 int	compat_20_sys_fhstatfs(struct lwp *, void *, register_t *);
 
diff --git a/sys/compat/freebsd/freebsd_syscalls.c b/sys/compat/freebsd/freebsd_syscalls.c
index 85e8044b172d..52072d1ff367 100644
--- a/sys/compat/freebsd/freebsd_syscalls.c
+++ b/sys/compat/freebsd/freebsd_syscalls.c
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_syscalls.c,v 1.58 2005/02/26 23:58:19 perry Exp $ */
+/* $NetBSD: freebsd_syscalls.c,v 1.59 2005/08/19 02:03:57 christos Exp $ */
 
 /*
  * System call names.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_syscalls.c,v 1.58 2005/02/26 23:58:19 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_syscalls.c,v 1.59 2005/08/19 02:03:57 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
diff --git a/sys/compat/freebsd/freebsd_sysent.c b/sys/compat/freebsd/freebsd_sysent.c
index ee6c55de67b4..a577ff18ebb6 100644
--- a/sys/compat/freebsd/freebsd_sysent.c
+++ b/sys/compat/freebsd/freebsd_sysent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_sysent.c,v 1.60 2005/02/26 23:58:19 perry Exp $ */
+/* $NetBSD: freebsd_sysent.c,v 1.61 2005/08/19 02:03:57 christos Exp $ */
 
 /*
  * System call switch table.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.60 2005/02/26 23:58:19 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.61 2005/08/19 02:03:57 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
@@ -670,8 +670,8 @@ struct sysent freebsd_sysent[] = {
 	    sys_nosys },			/* 270 = unimplemented */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 271 = unimplemented */
-	{ 3, s(struct sys_getdents_args), 0,
-	    sys_getdents },			/* 272 = getdents */
+	{ 3, s(struct compat_30_sys_getdents_args), 0,
+	    compat_30_sys_getdents },		/* 272 = getdents */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 273 = unimplemented */
 	{ 2, s(struct sys_lchmod_args), 0,
@@ -682,12 +682,12 @@ struct sysent freebsd_sysent[] = {
 	    sys_lutimes },			/* 276 = lutimes */
 	{ 3, s(struct sys___msync13_args), 0,
 	    sys___msync13 },			/* 277 = __msync13 */
-	{ 2, s(struct sys___stat13_args), 0,
-	    sys___stat13 },			/* 278 = __stat13 */
-	{ 2, s(struct sys___fstat13_args), 0,
-	    sys___fstat13 },			/* 279 = __fstat13 */
-	{ 2, s(struct sys___lstat13_args), 0,
-	    sys___lstat13 },			/* 280 = __lstat13 */
+	{ 2, s(struct compat_30_sys___stat13_args), 0,
+	    compat_30_sys___stat13 },		/* 278 = __stat13 */
+	{ 2, s(struct compat_30_sys___fstat13_args), 0,
+	    compat_30_sys___fstat13 },		/* 279 = __fstat13 */
+	{ 2, s(struct compat_30_sys___lstat13_args), 0,
+	    compat_30_sys___lstat13 },		/* 280 = __lstat13 */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 281 = unimplemented */
 	{ 0, 0, 0,
diff --git a/sys/compat/freebsd/syscalls.master b/sys/compat/freebsd/syscalls.master
index e3d81d2eb30a..a2d12798210c 100644
--- a/sys/compat/freebsd/syscalls.master
+++ b/sys/compat/freebsd/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.47 2005/02/22 16:14:50 heas Exp $
+	$NetBSD: syscalls.master,v 1.48 2005/08/19 02:03:57 christos Exp $
 
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 
@@ -528,7 +528,7 @@
 269	UNIMPL
 270	UNIMPL
 271	UNIMPL
-272	NOARGS		{ int sys_getdents(int fd, char *buf, size_t count); }
+272	NOARGS		{ int compat_30_sys_getdents(int fd, char *buf, size_t count); }
 273	UNIMPL
 274	NOARGS		{ int sys_lchmod(const char *path, mode_t mode); }
 275	NOARGS		{ int sys_lchown(const char *path, uid_t uid, \
@@ -536,9 +536,9 @@
 276	NOARGS		{ int sys_lutimes(const char *path, \
 			    const struct timeval *tptr); }
 277	NOARGS		{ int sys___msync13(void *addr, size_t len, int flags); }
-278	NOARGS		{ int sys___stat13(const char *path, struct stat *ub); }
-279	NOARGS		{ int sys___fstat13(int fd, struct stat *sb); }
-280	NOARGS		{ int sys___lstat13(const char *path, struct stat *ub);}
+278	NOARGS		{ int compat_30_sys___stat13(const char *path, struct stat30 *ub); }
+279	NOARGS		{ int compat_30_sys___fstat13(int fd, struct stat30 *sb); }
+280	NOARGS		{ int compat_30_sys___lstat13(const char *path, struct stat30 *ub);}
 281	UNIMPL
 282	UNIMPL
 283	UNIMPL
diff --git a/sys/compat/ibcs2/ibcs2_stat.c b/sys/compat/ibcs2/ibcs2_stat.c
index e1edd1ec4d33..5dea84f201e9 100644
--- a/sys/compat/ibcs2/ibcs2_stat.c
+++ b/sys/compat/ibcs2/ibcs2_stat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ibcs2_stat.c,v 1.31 2005/05/29 22:08:16 christos Exp $	*/
+/*	$NetBSD: ibcs2_stat.c,v 1.32 2005/08/19 02:03:57 christos Exp $	*/
 /*
  * Copyright (c) 1995, 1998 Scott Bartram
  * All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_stat.c,v 1.31 2005/05/29 22:08:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_stat.c,v 1.32 2005/08/19 02:03:57 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -274,14 +274,14 @@ ibcs2_sys_stat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat st;
 	struct ibcs2_stat ibcs2_st;
-	struct sys___stat13_args cup;
+	struct sys___stat30_args cup;
 	int error;
 	caddr_t sg = stackgap_init(p, 0);
 	SCARG(&cup, ub) = stackgap_alloc(p, &sg, sizeof(st));
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 	SCARG(&cup, path) = SCARG(uap, path);
 
-	if ((error = sys___stat13(l, &cup, retval)) != 0)
+	if ((error = sys___stat30(l, &cup, retval)) != 0)
 		return error;
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof(st))) != 0)
 		return error;
@@ -303,7 +303,7 @@ ibcs2_sys_lstat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat st;
 	struct ibcs2_stat ibcs2_st;
-	struct sys___lstat13_args cup;
+	struct sys___lstat30_args cup;
 	int error;
 	caddr_t sg = stackgap_init(p, 0);
 
@@ -311,7 +311,7 @@ ibcs2_sys_lstat(l, v, retval)
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 	SCARG(&cup, path) = SCARG(uap, path);
 
-	if ((error = sys___lstat13(l, &cup, retval)) != 0)
+	if ((error = sys___lstat30(l, &cup, retval)) != 0)
 		return error;
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof(st))) != 0)
 		return error;
@@ -333,13 +333,13 @@ ibcs2_sys_fstat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat st;
 	struct ibcs2_stat ibcs2_st;
-	struct sys___fstat13_args cup;
+	struct sys___fstat30_args cup;
 	int error;
 	caddr_t sg = stackgap_init(p, 0);
 
 	SCARG(&cup, fd) = SCARG(uap, fd);
 	SCARG(&cup, sb) = stackgap_alloc(p, &sg, sizeof(st));
-	if ((error = sys___fstat13(l, &cup, retval)) != 0)
+	if ((error = sys___fstat30(l, &cup, retval)) != 0)
 		return error;
 	if ((error = copyin(SCARG(&cup, sb), &st, sizeof(st))) != 0)
 		return error;
diff --git a/sys/compat/linux/common/linux_file.c b/sys/compat/linux/common/linux_file.c
index adc4c1c45d8f..370132ea76e4 100644
--- a/sys/compat/linux/common/linux_file.c
+++ b/sys/compat/linux/common/linux_file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_file.c,v 1.69 2005/05/29 22:08:16 christos Exp $	*/
+/*	$NetBSD: linux_file.c,v 1.70 2005/08/19 02:03:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.69 2005/05/29 22:08:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_file.c,v 1.70 2005/08/19 02:03:57 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -540,7 +540,7 @@ linux_sys_fstat(l, v, retval)
 		syscallarg(linux_stat *) sp;
 	} */ *uap = v;
 	struct proc *p = l->l_proc;
-	struct sys___fstat13_args fsa;
+	struct sys___fstat30_args fsa;
 	struct linux_stat tmplst;
 	struct stat *st,tmpst;
 	caddr_t sg;
@@ -553,7 +553,7 @@ linux_sys_fstat(l, v, retval)
 	SCARG(&fsa, fd) = SCARG(uap, fd);
 	SCARG(&fsa, sb) = st;
 
-	if ((error = sys___fstat13(l, &fsa, retval)))
+	if ((error = sys___fstat30(l, &fsa, retval)))
 		return error;
 
 	if ((error = copyin(st, &tmpst, sizeof tmpst)))
@@ -574,7 +574,7 @@ linux_stat1(l, v, retval, dolstat)
 	register_t *retval;
 	int dolstat;
 {
-	struct sys___stat13_args sa;
+	struct sys___stat30_args sa;
 	struct linux_stat tmplst;
 	struct stat *st, tmpst;
 	struct proc *p = l->l_proc;
@@ -592,8 +592,8 @@ linux_stat1(l, v, retval, dolstat)
 	SCARG(&sa, ub) = st;
 	SCARG(&sa, path) = SCARG(uap, path);
 
-	if ((error = (dolstat ? sys___lstat13(l, &sa, retval) :
-				sys___stat13(l, &sa, retval))))
+	if ((error = (dolstat ? sys___lstat30(l, &sa, retval) :
+				sys___stat30(l, &sa, retval))))
 		return error;
 
 	if ((error = copyin(st, &tmpst, sizeof tmpst)))
diff --git a/sys/compat/linux/common/linux_file64.c b/sys/compat/linux/common/linux_file64.c
index 9a044e3280c5..a86e7b1a3428 100644
--- a/sys/compat/linux/common/linux_file64.c
+++ b/sys/compat/linux/common/linux_file64.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_file64.c,v 1.28 2005/05/29 22:08:16 christos Exp $	*/
+/*	$NetBSD: linux_file64.c,v 1.29 2005/08/19 02:03:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998, 2000 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_file64.c,v 1.28 2005/05/29 22:08:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_file64.c,v 1.29 2005/08/19 02:03:57 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -130,7 +130,7 @@ linux_sys_fstat64(l, v, retval)
 		syscallarg(struct linux_stat64 *) sp;
 	} */ *uap = v;
 	struct proc *p = l->l_proc;
-	struct sys___fstat13_args fsa;
+	struct sys___fstat30_args fsa;
 	struct linux_stat64 tmplst;
 	struct stat *st,tmpst;
 	caddr_t sg;
@@ -143,7 +143,7 @@ linux_sys_fstat64(l, v, retval)
 	SCARG(&fsa, fd) = SCARG(uap, fd);
 	SCARG(&fsa, sb) = st;
 
-	if ((error = sys___fstat13(l, &fsa, retval)))
+	if ((error = sys___fstat30(l, &fsa, retval)))
 		return error;
 
 	if ((error = copyin(st, &tmpst, sizeof tmpst)))
@@ -165,7 +165,7 @@ linux_do_stat64(l, v, retval, dolstat)
 	int dolstat;
 {
 	struct proc *p = l->l_proc;
-	struct sys___stat13_args sa;
+	struct sys___stat30_args sa;
 	struct linux_stat64 tmplst;
 	struct stat *st, tmpst;
 	caddr_t sg;
@@ -179,8 +179,8 @@ linux_do_stat64(l, v, retval, dolstat)
 	SCARG(&sa, ub) = st;
 	SCARG(&sa, path) = SCARG(uap, path);
 
-	if ((error = (dolstat ? sys___lstat13(l, &sa, retval) :
-				sys___stat13(l, &sa, retval))))
+	if ((error = (dolstat ? sys___lstat30(l, &sa, retval) :
+				sys___stat30(l, &sa, retval))))
 		return error;
 
 	if ((error = copyin(st, &tmpst, sizeof tmpst)))
diff --git a/sys/compat/mach/mach_syscall.h b/sys/compat/mach/mach_syscall.h
index c084696c352f..ea5a797e5e05 100644
--- a/sys/compat/mach/mach_syscall.h
+++ b/sys/compat/mach/mach_syscall.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mach_syscall.h,v 1.15 2005/02/26 23:58:20 perry Exp $ */
+/* $NetBSD: mach_syscall.h,v 1.16 2005/08/19 02:03:57 christos Exp $ */
 
 /*
  * System call numbers.
diff --git a/sys/compat/mach/mach_syscallargs.h b/sys/compat/mach/mach_syscallargs.h
index 19060f8e0eec..ec339410e072 100644
--- a/sys/compat/mach/mach_syscallargs.h
+++ b/sys/compat/mach/mach_syscallargs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: mach_syscallargs.h,v 1.15 2005/02/26 23:58:20 perry Exp $ */
+/* $NetBSD: mach_syscallargs.h,v 1.16 2005/08/19 02:03:57 christos Exp $ */
 
 /*
  * System call argument lists.
diff --git a/sys/compat/mach/mach_syscalls.c b/sys/compat/mach/mach_syscalls.c
index eeab9b4d87bf..055e021e2519 100644
--- a/sys/compat/mach/mach_syscalls.c
+++ b/sys/compat/mach/mach_syscalls.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mach_syscalls.c,v 1.15 2005/02/26 23:58:20 perry Exp $ */
+/* $NetBSD: mach_syscalls.c,v 1.16 2005/08/19 02:03:57 christos Exp $ */
 
 /*
  * System call names.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_syscalls.c,v 1.15 2005/02/26 23:58:20 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_syscalls.c,v 1.16 2005/08/19 02:03:57 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
diff --git a/sys/compat/mach/mach_sysent.c b/sys/compat/mach/mach_sysent.c
index b45399d89835..57f4ccff2686 100644
--- a/sys/compat/mach/mach_sysent.c
+++ b/sys/compat/mach/mach_sysent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mach_sysent.c,v 1.16 2005/02/26 23:58:20 perry Exp $ */
+/* $NetBSD: mach_sysent.c,v 1.17 2005/08/19 02:03:57 christos Exp $ */
 
 /*
  * System call switch table.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mach_sysent.c,v 1.16 2005/02/26 23:58:20 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mach_sysent.c,v 1.17 2005/08/19 02:03:57 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ntp.h"
diff --git a/sys/compat/netbsd32/files.netbsd32 b/sys/compat/netbsd32/files.netbsd32
index e33475624799..64cc645ffe66 100644
--- a/sys/compat/netbsd32/files.netbsd32
+++ b/sys/compat/netbsd32/files.netbsd32
@@ -1,4 +1,4 @@
-#	$NetBSD: files.netbsd32,v 1.17 2004/06/17 18:29:40 cube Exp $
+#	$NetBSD: files.netbsd32,v 1.18 2005/08/19 02:03:57 christos Exp $
 #
 # config file description for machine-independent netbsd32 compat code.
 # included by ports that need it.
@@ -29,4 +29,5 @@ file	compat/netbsd32/netbsd32_compat_12.c	compat_netbsd32 & (compat_12 | compat_
 file	compat/netbsd32/netbsd32_compat_13.c	compat_netbsd32 & compat_13
 file	compat/netbsd32/netbsd32_compat_14.c	compat_netbsd32 & compat_14
 file	compat/netbsd32/netbsd32_compat_20.c	compat_netbsd32 & compat_20
+file	compat/netbsd32/netbsd32_compat_30.c	compat_netbsd32 & compat_30
 file	compat/netbsd32/netbsd32_compat_43.c	compat_netbsd32 & (compat_43 | compat_sunos)
diff --git a/sys/compat/netbsd32/netbsd32.h b/sys/compat/netbsd32/netbsd32.h
index 56094305c3eb..5940820ab5c0 100644
--- a/sys/compat/netbsd32/netbsd32.h
+++ b/sys/compat/netbsd32/netbsd32.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32.h,v 1.37 2005/07/23 22:04:12 cube Exp $	*/
+/*	$NetBSD: netbsd32.h,v 1.38 2005/08/19 02:03:57 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -438,7 +438,7 @@ struct netbsd32_omsghdr {
 typedef netbsd32_pointer_t netbsd32_stat12p_t;
 struct netbsd32_stat12 {			/* NetBSD-1.2 stat struct */
 	dev_t	  st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
+	u_int32_t st_ino;		/* inode's number */
 	u_int16_t st_mode;		/* inode protection mode */
 	u_int16_t st_nlink;		/* number of hard links */
 	uid_t	  st_uid;		/* user ID of the file's owner */
@@ -459,7 +459,7 @@ struct netbsd32_stat12 {			/* NetBSD-1.2 stat struct */
 typedef netbsd32_pointer_t netbsd32_stat43p_t;
 struct netbsd32_stat43 {			/* BSD-4.3 stat struct */
 	u_int16_t st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
+	u_int32_t st_ino;		/* inode's number */
 	u_int16_t st_mode;		/* inode protection mode */
 	u_int16_t st_nlink;		/* number of hard links */
 	u_int16_t st_uid;		/* user ID of the file's owner */
@@ -474,10 +474,10 @@ struct netbsd32_stat43 {			/* BSD-4.3 stat struct */
 	u_int32_t st_flags;		/* user defined flags for file */
 	u_int32_t st_gen;		/* file generation number */
 };
-typedef netbsd32_pointer_t netbsd32_statp_t;
-struct netbsd32_stat {
+typedef netbsd32_pointer_t netbsd32_stat30p_t;
+struct netbsd32_stat30 {
 	dev_t	  st_dev;		/* inode's device */
-	ino_t	  st_ino;		/* inode's number */
+	u_int32_t st_ino;		/* inode's number */
 	mode_t	  st_mode;		/* inode protection mode */
 	nlink_t	  st_nlink;		/* number of hard links */
 	uid_t	  st_uid;		/* user ID of the file's owner */
@@ -491,8 +491,31 @@ struct netbsd32_stat {
 	blksize_t st_blksize;		/* optimal blocksize for I/O */
 	u_int32_t st_flags;		/* user defined flags for file */
 	u_int32_t st_gen;		/* file generation number */
-	int64_t	  st_qspare[2];
+	u_int32_t st_spare;		/* file generation number */
+	struct	  netbsd32_timespec st_birthtimespec;
+	u_int32_t st_spare2;
 }
+
+typedef netbsd32_pointer_t netbsd32_statp_t;
+struct netbsd32_stat {
+	dev_t	  st_dev;		/* inode's device */
+	mode_t	  st_mode;		/* inode protection mode */
+	ino_t	  st_ino;		/* inode's number */
+	nlink_t	  st_nlink;		/* number of hard links */
+	uid_t	  st_uid;		/* user ID of the file's owner */
+	gid_t	  st_gid;		/* group ID of the file's group */
+	dev_t	  st_rdev;		/* device type */
+	struct	  netbsd32_timespec st_atimespec;/* time of last access */
+	struct	  netbsd32_timespec st_mtimespec;/* time of last data modification */
+	struct	  netbsd32_timespec st_ctimespec;/* time of last file status change */
+	struct 	  netbsd32_timespec st_birthtimespec; /* time of creation */
+	off_t	  st_size;		/* file size, in bytes */
+	blkcnt_t  st_blocks;		/* blocks allocated for file */
+	blksize_t st_blksize;		/* optimal blocksize for I/O */
+	u_int32_t st_flags;		/* user defined flags for file */
+	u_int32_t st_gen;		/* file generation number */
+	u_int32_t st_spare[2];
+};
 #ifdef __x86_64__
 __attribute__((packed))
 #endif
diff --git a/sys/compat/netbsd32/netbsd32_compat_30.c b/sys/compat/netbsd32/netbsd32_compat_30.c
new file mode 100644
index 000000000000..208c485b8531
--- /dev/null
+++ b/sys/compat/netbsd32/netbsd32_compat_30.c
@@ -0,0 +1,199 @@
+/*	$NetBSD: netbsd32_compat_30.c,v 1.1 2005/08/19 02:03:57 christos Exp $	*/
+
+/*
+ * Copyright (c) 1998, 2001 Matthew R. Green
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_30.c,v 1.1 2005/08/19 02:03:57 christos Exp $");
+
+#if defined(_KERNEL_OPT)
+#include "opt_ktrace.h"
+#endif
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/mount.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/ktrace.h>
+#include <sys/resourcevar.h>
+#include <sys/vnode.h>
+#include <sys/file.h>
+#include <sys/filedesc.h>
+#include <sys/namei.h>
+#include <sys/sa.h>
+#include <sys/statvfs.h>
+#include <sys/syscallargs.h>
+#include <sys/proc.h>
+
+#include <compat/netbsd32/netbsd32.h>
+#include <compat/netbsd32/netbsd32_syscallargs.h>
+#include <compat/netbsd32/netbsd32_conv.h>
+
+
+int
+netbsd32_getdents(l, v, retval)
+	struct lwp *l;
+	void *v;
+	register_t *retval;
+{
+	struct netbsd32_getdents_args /* {
+		syscallarg(int) fd;
+		syscallarg(netbsd32_charp) buf;
+		syscallarg(netbsd32_size_t) count;
+	} */ *uap = v;
+	struct file *fp;
+	int error, done;
+	char  *buf;
+	struct proc *p = l->l_proc;
+
+	/* getvnode() will use the descriptor for us */
+	if ((error = getvnode(p->p_fd, SCARG(uap, fd), &fp)) != 0)
+		return (error);
+	if ((fp->f_flag & FREAD) == 0) {
+		error = EBADF;
+		goto out;
+	}
+	buf = malloc(SCARG(uap, count), M_TEMP, M_WAITOK);
+	error = vn_readdir(fp, obuf,
+	    UIO_SYSSPACE, SCARG(uap, count), &done, p, 0, 0);
+	if (error == 0) {
+		*retval = netbsd32_to_dirent12(buf, done);
+		error = copyout(buf, NETBSD32PTR64(SCARG(uap, buf)), *retval);
+	}
+	free(buf, M_TEMP);
+ out:
+	FILE_UNUSE(fp, p);
+	return (error);
+}
+
+int
+netbsd32___stat13(l, v, retval)
+	struct lwp *l;
+	void *v;
+	register_t *retval;
+{
+	struct netbsd32___stat13_args /* {
+		syscallarg(const netbsd32_charp) path;
+		syscallarg(netbsd32_stat13p_t) ub;
+	} */ *uap = v;
+	struct netbsd32_stat30 sb32;
+	struct stat sb;
+	int error;
+	struct nameidata nd;
+	caddr_t sg;
+	const char *path;
+	struct proc *p = l->l_proc;
+
+	path = (char *)NETBSD32PTR64(SCARG(uap, path));
+	sg = stackgap_init(p, 0);
+	CHECK_ALT_EXIST(p, &sg, path);
+
+	NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE, path, p);
+	if ((error = namei(&nd)) != 0)
+		return (error);
+	error = vn_stat(nd.ni_vp, &sb, p);
+	vput(nd.ni_vp);
+	if (error)
+		return (error);
+	netbsd32_from___stat13(&sb, &sb32);
+	error = copyout(&sb32, (caddr_t)NETBSD32PTR64(SCARG(uap, ub)),
+	    sizeof(sb32));
+	return (error);
+}
+
+int
+netbsd32___fstat13(l, v, retval)
+	struct lwp *l;
+	void *v;
+	register_t *retval;
+{
+	struct netbsd32___fstat13_args /* {
+		syscallarg(int) fd;
+		syscallarg(netbsd32_stat13p_t) sb;
+	} */ *uap = v;
+	int fd = SCARG(uap, fd);
+	struct proc *p = l->l_proc;
+	struct filedesc *fdp = p->p_fd;
+	struct file *fp;
+	struct netbsd32_stat sb32;
+	struct stat ub;
+	int error = 0;
+
+	if ((fp = fd_getfile(fdp, fd)) == NULL)
+		return (EBADF);
+
+	FILE_USE(fp);
+	error = (*fp->f_ops->fo_stat)(fp, &ub, p);
+	FILE_UNUSE(fp, p);
+
+	if (error == 0) {
+		netbsd32_from___stat13(&ub, &sb32);
+		error = copyout(&sb32, (caddr_t)NETBSD32PTR64(SCARG(uap, sb)),
+		    sizeof(sb32));
+	}
+	return (error);
+}
+
+int
+netbsd32___lstat13(l, v, retval)
+	struct lwp *l;
+	void *v;
+	register_t *retval;
+{
+	struct netbsd32___lstat13_args /* {
+		syscallarg(const netbsd32_charp) path;
+		syscallarg(netbsd32_stat13p_t) ub;
+	} */ *uap = v;
+	struct netbsd32_stat sb32;
+	struct stat sb;
+	int error;
+	struct nameidata nd;
+	caddr_t sg;
+	const char *path;
+	struct proc *p = l->l_proc;
+
+	path = (char *)NETBSD32PTR64(SCARG(uap, path));
+	sg = stackgap_init(p, 0);
+	CHECK_ALT_EXIST(p, &sg, path);
+
+	NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF, UIO_USERSPACE, path, p);
+	if ((error = namei(&nd)) != 0)
+		return (error);
+	error = vn_stat(nd.ni_vp, &sb, p);
+	vput(nd.ni_vp);
+	if (error)
+		return (error);
+	netbsd32_from___stat13(&sb, &sb32);
+	error = copyout(&sb32, (caddr_t)NETBSD32PTR64(SCARG(uap, ub)),
+	    sizeof(sb32));
+	return (error);
+}
diff --git a/sys/compat/netbsd32/netbsd32_conv.h b/sys/compat/netbsd32/netbsd32_conv.h
index ced2b9c91993..c0b34759c9c7 100644
--- a/sys/compat/netbsd32/netbsd32_conv.h
+++ b/sys/compat/netbsd32/netbsd32_conv.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_conv.h,v 1.7 2005/07/23 21:51:29 cube Exp $	*/
+/*	$NetBSD: netbsd32_conv.h,v 1.8 2005/08/19 02:03:57 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -346,6 +346,31 @@ netbsd32_to_timex(tx32p, txp)
 
 static __inline void
 netbsd32_from___stat13(sbp, sb32p)
+	const struct stat *sbp;
+	struct netbsd32_stat13 *sb32p;
+{
+	sb32p->st_dev = sbp->st_dev;
+	sb32p->st_ino = sbp->st_ino;
+	sb32p->st_mode = sbp->st_mode;
+	sb32p->st_nlink = sbp->st_nlink;
+	sb32p->st_uid = sbp->st_uid;
+	sb32p->st_gid = sbp->st_gid;
+	sb32p->st_rdev = sbp->st_rdev;
+	sb32p->st_size = sbp->st_size;
+	sb32p->st_atimespec.tv_sec = (netbsd32_time_t)sbp->st_atimespec.tv_sec;
+	sb32p->st_atimespec.tv_nsec = (netbsd32_long)sbp->st_atimespec.tv_nsec;
+	sb32p->st_mtimespec.tv_sec = (netbsd32_time_t)sbp->st_mtimespec.tv_sec;
+	sb32p->st_mtimespec.tv_nsec = (netbsd32_long)sbp->st_mtimespec.tv_nsec;
+	sb32p->st_ctimespec.tv_sec = (netbsd32_time_t)sbp->st_ctimespec.tv_sec;
+	sb32p->st_ctimespec.tv_nsec = (netbsd32_long)sbp->st_ctimespec.tv_nsec;
+	sb32p->st_blksize = sbp->st_blksize;
+	sb32p->st_blocks = sbp->st_blocks;
+	sb32p->st_flags = sbp->st_flags;
+	sb32p->st_gen = sbp->st_gen;
+}
+
+static __inline void
+netbsd32_from___stat30(sbp, sb32p)
 	const struct stat *sbp;
 	struct netbsd32_stat *sb32p;
 {
@@ -356,10 +381,7 @@ netbsd32_from___stat13(sbp, sb32p)
 	sb32p->st_uid = sbp->st_uid;
 	sb32p->st_gid = sbp->st_gid;
 	sb32p->st_rdev = sbp->st_rdev;
-	if (sbp->st_size < (quad_t)1 << 32)
-		sb32p->st_size = sbp->st_size;
-	else
-		sb32p->st_size = -2;
+	sb32p->st_size = sbp->st_size;
 	sb32p->st_atimespec.tv_sec = (netbsd32_time_t)sbp->st_atimespec.tv_sec;
 	sb32p->st_atimespec.tv_nsec = (netbsd32_long)sbp->st_atimespec.tv_nsec;
 	sb32p->st_mtimespec.tv_sec = (netbsd32_time_t)sbp->st_mtimespec.tv_sec;
@@ -549,5 +571,35 @@ netbsd32_to_sigevent(const struct netbsd32_sigevent *ev32, struct sigevent *ev)
 	ev->sigev_notify_function = (void *)(intptr_t)ev32->sigev_notify_function;
 	ev->sigev_notify_attributes = (void *)(intptr_t)ev32->sigev_notify_attributes;
 }
+int
+netbsd32_to_dirent12(char *nbuf, char *obuf, int nbytes)
+{
+	struct dirent *ndp, *nndp, *endp;
+	struct dirent12 *odp;
+
+	odp = (struct dirent12 *)(void *)buf;
+	ndp = (struct dirent *)(void *)buf;
+	endp = (struct dirent *)(void *)&buf[nbytes];
+
+	/*
+	 * In-place conversion. This works because odp
+	 * is smaller than ndp, but it has to be done
+	 * in the right sequence.
+	 */
+	for (; ndp < endp; ndp = nndp) {
+		nndp = _DIRENT_NEXT(ndp);
+		odp->d_ino = (u_int32_t)ndp->d_ino;
+		if (ndp->d_namlen >= sizeof(odp->d_name))
+			odp->d_namlen = sizeof(odp->d_name) - 1;
+		else
+			odp->d_namlen = (u_int8_t)ndp->d_namlen;
+		odp->d_type = ndp->d_type;
+		(void)memcpy(odp->d_name, ndp->d_name, (size_t)odp->d_namlen);
+		odp->d_name[odp->d_namlen] = '\0';
+		odp->d_reclen = _DIRENT_SIZE(odp);
+		odp = _DIRENT_NEXT(odp);
+	}
+	return ((char *)(void *)odp) - buf;
+}
 
 #endif /* _COMPAT_NETBSD32_NETBSD32_CONV_H_ */
diff --git a/sys/compat/netbsd32/netbsd32_fs.c b/sys/compat/netbsd32/netbsd32_fs.c
index 4c102989d62f..05e0a9fe963f 100644
--- a/sys/compat/netbsd32/netbsd32_fs.c
+++ b/sys/compat/netbsd32/netbsd32_fs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_fs.c,v 1.20 2005/07/10 16:34:53 cube Exp $	*/
+/*	$NetBSD: netbsd32_fs.c,v 1.21 2005/08/19 02:03:57 christos Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.20 2005/07/10 16:34:53 cube Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.21 2005/08/19 02:03:57 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
@@ -615,7 +615,7 @@ netbsd32_futimes(l, v, retval)
 }
 
 int
-netbsd32_getdents(l, v, retval)
+netbsd32___getdents30(l, v, retval)
 	struct lwp *l;
 	void *v;
 	register_t *retval;
diff --git a/sys/compat/netbsd32/syscalls.master b/sys/compat/netbsd32/syscalls.master
index 787dafd50629..c681d61841de 100644
--- a/sys/compat/netbsd32/syscalls.master
+++ b/sys/compat/netbsd32/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.37 2005/07/23 22:03:45 cube Exp $
+	$NetBSD: syscalls.master,v 1.38 2005/08/19 02:03:57 christos Exp $
 
 ;	from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -443,9 +443,9 @@
 275	STD		{ int netbsd32_lchown(const netbsd32_charp path, uid_t uid, gid_t gid); }
 276	STD		{ int netbsd32_lutimes(const netbsd32_charp path, const netbsd32_timevalp_t tptr); }
 277	STD		{ int netbsd32___msync13(netbsd32_voidp addr, netbsd32_size_t len, int flags); }
-278	STD		{ int netbsd32___stat13(const netbsd32_charp path, netbsd32_statp_t ub); }
-279	STD		{ int netbsd32___fstat13(int fd, netbsd32_statp_t sb); }
-280	STD		{ int netbsd32___lstat13(const netbsd32_charp path, netbsd32_statp_t ub); }
+278	STD		{ int netbsd32___stat13(const netbsd32_charp path, netbsd32_stat30p_t ub); }
+279	STD		{ int netbsd32___fstat13(int fd, netbsd32_stat30p_t sb); }
+280	STD		{ int netbsd32___lstat13(const netbsd32_charp path, netbsd32_stat30p_t ub); }
 281	STD		{ int netbsd32___sigaltstack14(const netbsd32_sigaltstackp_t nss, netbsd32_sigaltstackp_t oss); }
 282	NOARGS		{ int sys___vfork14(void); }
 283	STD		{ int netbsd32___posix_chown(const netbsd32_charp path, uid_t uid, gid_t gid); }
@@ -639,3 +639,11 @@
 			    const netbsd32_charp name); }
 386	STD		{ int netbsd32_fremovexattr(int fd, \
 			    const netbsd32_charp name); }
+387     STD             { int netbsd32_sys___stat30(const netbsd32_charp path, \
+			    netbsd32_statp_t ub); }
+388     STD             { int netbsd32_sys___fstat30(int fd, \
+			    netbsd32_statp_t sb); }
+389     STD             { int netbsd32_sys___lstat30( \
+			    const netbsd32_charp path, netbsd32_statp_t ub); }
+390     STD             { int netbsd32_sys___getdents30(int fd, \
+			    netbsd32_charp buf, netbsd32_size_t count);
diff --git a/sys/compat/pecoff/pecoff_misc.c b/sys/compat/pecoff/pecoff_misc.c
index 49b5804d3623..f26c694e7079 100644
--- a/sys/compat/pecoff/pecoff_misc.c
+++ b/sys/compat/pecoff/pecoff_misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pecoff_misc.c,v 1.10 2005/02/26 23:10:21 perry Exp $	*/
+/*	$NetBSD: pecoff_misc.c,v 1.11 2005/08/19 02:03:57 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pecoff_misc.c,v 1.10 2005/02/26 23:10:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pecoff_misc.c,v 1.11 2005/08/19 02:03:57 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
@@ -581,34 +581,34 @@ pecoff_sys_lutimes(l, v, retval)
 
 
 int
-pecoff_sys___stat13(l, v, retval)
+pecoff_sys___stat30(l, v, retval)
 	struct lwp *l;
 	void *v;
 	register_t *retval;
 {
 	struct proc *p = l->l_proc;
-	struct pecoff_sys___stat13_args *uap = v;
+	struct pecoff_sys___stat30_args *uap = v;
 	caddr_t sg = stackgap_init(p, 0);
 
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 
-	return sys___stat13(l, v, retval);
+	return sys___stat30(l, v, retval);
 }
 
 
 int
-pecoff_sys___lstat13(l, v, retval)
+pecoff_sys___lstat30(l, v, retval)
 	struct lwp *l;
 	void *v;
 	register_t *retval;
 {
 	struct proc *p = l->l_proc;
-	struct pecoff_sys___lstat13_args *uap = v;
+	struct pecoff_sys___lstat30_args *uap = v;
 	caddr_t sg = stackgap_init(p, 0);
 
 	CHECK_ALT_SYMLINK(p, &sg, SCARG(uap, path));
 
-	return sys___lstat13(l, v, retval);
+	return sys___lstat30(l, v, retval);
 }
 
 
diff --git a/sys/compat/pecoff/pecoff_syscall.h b/sys/compat/pecoff/pecoff_syscall.h
index ae552afd10b8..74be349fc5c3 100644
--- a/sys/compat/pecoff/pecoff_syscall.h
+++ b/sys/compat/pecoff/pecoff_syscall.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pecoff_syscall.h,v 1.12 2005/02/26 23:58:20 perry Exp $ */
+/* $NetBSD: pecoff_syscall.h,v 1.13 2005/08/19 02:03:57 christos Exp $ */
 
 /*
  * System call numbers.
@@ -669,8 +669,8 @@
 /* syscall: "swapctl" ret: "int" args: "int" "const void *" "int" */
 #define	PECOFF_SYS_swapctl	271
 
-/* syscall: "getdents" ret: "int" args: "int" "char *" "size_t" */
-#define	PECOFF_SYS_getdents	272
+/* syscall: "__getdents30" ret: "int" args: "int" "char *" "size_t" */
+#define	PECOFF_SYS___getdents30	272
 
 /* syscall: "minherit" ret: "int" args: "void *" "size_t" "int" */
 #define	PECOFF_SYS_minherit	273
@@ -687,14 +687,14 @@
 /* syscall: "__msync13" ret: "int" args: "void *" "size_t" "int" */
 #define	PECOFF_SYS___msync13	277
 
-/* syscall: "__stat13" ret: "int" args: "const char *" "struct stat *" */
-#define	PECOFF_SYS___stat13	278
+/* syscall: "__stat30" ret: "int" args: "const char *" "struct stat *" */
+#define	PECOFF_SYS___stat30	278
 
-/* syscall: "__fstat13" ret: "int" args: "int" "struct stat *" */
-#define	PECOFF_SYS___fstat13	279
+/* syscall: "__fstat30" ret: "int" args: "int" "struct stat *" */
+#define	PECOFF_SYS___fstat30	279
 
-/* syscall: "__lstat13" ret: "int" args: "const char *" "struct stat *" */
-#define	PECOFF_SYS___lstat13	280
+/* syscall: "__lstat30" ret: "int" args: "const char *" "struct stat *" */
+#define	PECOFF_SYS___lstat30	280
 
 /* syscall: "__sigaltstack14" ret: "int" args: "const struct sigaltstack *" "struct sigaltstack *" */
 #define	PECOFF_SYS___sigaltstack14	281
diff --git a/sys/compat/pecoff/pecoff_syscallargs.h b/sys/compat/pecoff/pecoff_syscallargs.h
index 7cd2757697f7..acbf8ceac94b 100644
--- a/sys/compat/pecoff/pecoff_syscallargs.h
+++ b/sys/compat/pecoff/pecoff_syscallargs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: pecoff_syscallargs.h,v 1.13 2005/02/26 23:58:20 perry Exp $ */
+/* $NetBSD: pecoff_syscallargs.h,v 1.14 2005/08/19 02:03:57 christos Exp $ */
 
 /*
  * System call argument lists.
@@ -208,12 +208,12 @@ struct pecoff_sys_lutimes_args {
 	syscallarg(const struct timeval *) tptr;
 };
 
-struct pecoff_sys___stat13_args {
+struct pecoff_sys___stat30_args {
 	syscallarg(const char *) path;
 	syscallarg(struct stat *) ub;
 };
 
-struct pecoff_sys___lstat13_args {
+struct pecoff_sys___lstat30_args {
 	syscallarg(const char *) path;
 	syscallarg(struct stat *) ub;
 };
@@ -642,7 +642,7 @@ int	pecoff_sys___posix_rename(struct lwp *, void *, register_t *);
 
 int	sys_swapctl(struct lwp *, void *, register_t *);
 
-int	sys_getdents(struct lwp *, void *, register_t *);
+int	sys___getdents30(struct lwp *, void *, register_t *);
 
 int	sys_minherit(struct lwp *, void *, register_t *);
 
@@ -654,11 +654,11 @@ int	pecoff_sys_lutimes(struct lwp *, void *, register_t *);
 
 int	sys___msync13(struct lwp *, void *, register_t *);
 
-int	pecoff_sys___stat13(struct lwp *, void *, register_t *);
+int	pecoff_sys___stat30(struct lwp *, void *, register_t *);
 
-int	sys___fstat13(struct lwp *, void *, register_t *);
+int	sys___fstat30(struct lwp *, void *, register_t *);
 
-int	pecoff_sys___lstat13(struct lwp *, void *, register_t *);
+int	pecoff_sys___lstat30(struct lwp *, void *, register_t *);
 
 int	sys___sigaltstack14(struct lwp *, void *, register_t *);
 
diff --git a/sys/compat/pecoff/pecoff_syscalls.c b/sys/compat/pecoff/pecoff_syscalls.c
index 98e0883bd30a..ce25c37926b8 100644
--- a/sys/compat/pecoff/pecoff_syscalls.c
+++ b/sys/compat/pecoff/pecoff_syscalls.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pecoff_syscalls.c,v 1.12 2005/02/26 23:58:20 perry Exp $ */
+/* $NetBSD: pecoff_syscalls.c,v 1.13 2005/08/19 02:03:58 christos Exp $ */
 
 /*
  * System call names.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pecoff_syscalls.c,v 1.12 2005/02/26 23:58:20 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pecoff_syscalls.c,v 1.13 2005/08/19 02:03:58 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #if defined(_KERNEL_OPT)
@@ -402,15 +402,15 @@ const char *const pecoff_syscallnames[] = {
 	"#269 (unimplemented)",		/* 269 = unimplemented */
 	"__posix_rename",			/* 270 = __posix_rename */
 	"swapctl",			/* 271 = swapctl */
-	"getdents",			/* 272 = getdents */
+	"__getdents30",			/* 272 = __getdents30 */
 	"minherit",			/* 273 = minherit */
 	"lchmod",			/* 274 = lchmod */
 	"lchown",			/* 275 = lchown */
 	"lutimes",			/* 276 = lutimes */
 	"__msync13",			/* 277 = __msync13 */
-	"__stat13",			/* 278 = __stat13 */
-	"__fstat13",			/* 279 = __fstat13 */
-	"__lstat13",			/* 280 = __lstat13 */
+	"__stat30",			/* 278 = __stat30 */
+	"__fstat30",			/* 279 = __fstat30 */
+	"__lstat30",			/* 280 = __lstat30 */
 	"__sigaltstack14",			/* 281 = __sigaltstack14 */
 	"__vfork14",			/* 282 = __vfork14 */
 	"__posix_chown",			/* 283 = __posix_chown */
diff --git a/sys/compat/pecoff/pecoff_sysent.c b/sys/compat/pecoff/pecoff_sysent.c
index 00da2751503e..68ed0d4ecd47 100644
--- a/sys/compat/pecoff/pecoff_sysent.c
+++ b/sys/compat/pecoff/pecoff_sysent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: pecoff_sysent.c,v 1.13 2005/02/26 23:58:20 perry Exp $ */
+/* $NetBSD: pecoff_sysent.c,v 1.14 2005/08/19 02:03:58 christos Exp $ */
 
 /*
  * System call switch table.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pecoff_sysent.c,v 1.13 2005/02/26 23:58:20 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pecoff_sysent.c,v 1.14 2005/08/19 02:03:58 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ktrace.h"
@@ -721,8 +721,8 @@ struct sysent pecoff_sysent[] = {
 	    pecoff_sys___posix_rename },	/* 270 = __posix_rename */
 	{ 3, s(struct sys_swapctl_args), 0,
 	    sys_swapctl },			/* 271 = swapctl */
-	{ 3, s(struct sys_getdents_args), 0,
-	    sys_getdents },			/* 272 = getdents */
+	{ 3, s(struct sys___getdents30_args), 0,
+	    sys___getdents30 },			/* 272 = __getdents30 */
 	{ 3, s(struct sys_minherit_args), 0,
 	    sys_minherit },			/* 273 = minherit */
 	{ 2, s(struct pecoff_sys_lchmod_args), 0,
@@ -733,12 +733,12 @@ struct sysent pecoff_sysent[] = {
 	    pecoff_sys_lutimes },		/* 276 = lutimes */
 	{ 3, s(struct sys___msync13_args), 0,
 	    sys___msync13 },			/* 277 = __msync13 */
-	{ 2, s(struct pecoff_sys___stat13_args), 0,
-	    pecoff_sys___stat13 },		/* 278 = __stat13 */
-	{ 2, s(struct sys___fstat13_args), 0,
-	    sys___fstat13 },			/* 279 = __fstat13 */
-	{ 2, s(struct pecoff_sys___lstat13_args), 0,
-	    pecoff_sys___lstat13 },		/* 280 = __lstat13 */
+	{ 2, s(struct pecoff_sys___stat30_args), 0,
+	    pecoff_sys___stat30 },		/* 278 = __stat30 */
+	{ 2, s(struct sys___fstat30_args), 0,
+	    sys___fstat30 },			/* 279 = __fstat30 */
+	{ 2, s(struct pecoff_sys___lstat30_args), 0,
+	    pecoff_sys___lstat30 },		/* 280 = __lstat30 */
 	{ 2, s(struct sys___sigaltstack14_args), 0,
 	    sys___sigaltstack14 },		/* 281 = __sigaltstack14 */
 	{ 0, 0, 0,
diff --git a/sys/compat/pecoff/syscalls.master b/sys/compat/pecoff/syscalls.master
index 16e1040c381f..e1cdf86e0b89 100644
--- a/sys/compat/pecoff/syscalls.master
+++ b/sys/compat/pecoff/syscalls.master
@@ -1,4 +1,4 @@
-	$NetBSD: syscalls.master,v 1.11 2004/05/08 14:31:59 kent Exp $
+	$NetBSD: syscalls.master,v 1.12 2005/08/19 02:03:58 christos Exp $
 ; based on NetBSD: syscalls.master,v 1.128 2003/03/18 18:08:49 christos Exp
 
 ;	@(#)syscalls.master	8.2 (Berkeley) 1/13/94
@@ -579,7 +579,7 @@
 270	STD		{ int pecoff_sys___posix_rename(const char *from, \
 			    const char *to); }
 271	NOARGS		{ int sys_swapctl(int cmd, const void *arg, int misc); }
-272	NOARGS		{ int sys_getdents(int fd, char *buf, size_t count); }
+272	NOARGS		{ int sys___getdents30(int fd, char *buf, size_t count); }
 273	NOARGS		{ int sys_minherit(void *addr, size_t len, \
 			    int inherit); }
 274	STD		{ int pecoff_sys_lchmod(const char *path, mode_t mode); }
@@ -588,10 +588,10 @@
 276	STD		{ int pecoff_sys_lutimes(const char *path, \
 			    const struct timeval *tptr); }
 277	NOARGS		{ int sys___msync13(void *addr, size_t len, int flags); }
-278	STD		{ int pecoff_sys___stat13(const char *path, \
+278	STD		{ int pecoff_sys___stat30(const char *path, \
 			    struct stat *ub); }
-279	NOARGS		{ int sys___fstat13(int fd, struct stat *sb); }
-280	STD		{ int pecoff_sys___lstat13(const char *path, \
+279	NOARGS		{ int sys___fstat30(int fd, struct stat *sb); }
+280	STD		{ int pecoff_sys___lstat30(const char *path, \
 			    struct stat *ub); }
 281	NOARGS		{ int sys___sigaltstack14( \
 			    const struct sigaltstack *nss, \
diff --git a/sys/compat/sunos/sunos.h b/sys/compat/sunos/sunos.h
index cf5494d9ac07..a86b9521d7c8 100644
--- a/sys/compat/sunos/sunos.h
+++ b/sys/compat/sunos/sunos.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunos.h,v 1.18 2004/03/26 15:01:16 drochner Exp $	*/
+/*	$NetBSD: sunos.h,v 1.19 2005/08/19 02:03:58 christos Exp $	*/
 
 #ifndef _COMPAT_SUNOS_SUNOS_H_
 #define _COMPAT_SUNOS_SUNOS_H_
@@ -55,7 +55,7 @@ struct sunos_nfs_args {
 
 struct sunos_ustat {
 	int32_t	f_tfree;	/* total free */
-	ino_t	f_tinode;	/* total inodes free */
+	uint32_t f_tinode;	/* total inodes free */
 	char	f_path[6];	/* filsys name */
 	char	f_fpack[6];	/* filsys pack name */
 };
diff --git a/sys/compat/svr4/svr4_socket.c b/sys/compat/svr4/svr4_socket.c
index ef45ea6a86a2..b33defa468e7 100644
--- a/sys/compat/svr4/svr4_socket.c
+++ b/sys/compat/svr4/svr4_socket.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_socket.c,v 1.10 2003/01/18 08:44:27 thorpej Exp $	*/
+/*	$NetBSD: svr4_socket.c,v 1.11 2005/08/19 02:03:58 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_socket.c,v 1.10 2003/01/18 08:44:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_socket.c,v 1.11 2005/08/19 02:03:58 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -78,7 +78,7 @@ struct svr4_sockcache_entry {
 	void *cookie;		/* Internal cookie used for matching	*/
 	struct sockaddr_un sock;/* Pathname for the socket		*/
 	dev_t dev;		/* Device where the socket lives on	*/
-	ino_t ino;		/* Inode where the socket lives on	*/
+	svr4_ino_t ino;		/* Inode where the socket lives on	*/
 	TAILQ_ENTRY(svr4_sockcache_entry) entries;
 };
 
@@ -90,7 +90,7 @@ svr4_find_socket(p, fp, dev, ino)
 	struct proc *p;
 	struct file *fp;
 	dev_t dev;
-	ino_t ino;
+	svr4_ino_t ino;
 {
 	struct svr4_sockcache_entry *e;
 	void *cookie = ((struct socket *) fp->f_data)->so_internal;
diff --git a/sys/compat/svr4/svr4_socket.h b/sys/compat/svr4/svr4_socket.h
index 4913d2711c33..6142840a2a8a 100644
--- a/sys/compat/svr4/svr4_socket.h
+++ b/sys/compat/svr4/svr4_socket.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_socket.h,v 1.2 1998/09/04 19:54:39 christos Exp $	*/
+/*	$NetBSD: svr4_socket.h,v 1.3 2005/08/19 02:03:58 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@ struct proc;
 struct file;
 
 struct sockaddr_un *svr4_find_socket __P((struct proc *, struct file *,
-    dev_t, ino_t));
+    dev_t, svr4_ino_t));
 void svr4_delete_socket __P((struct proc *, struct file *));
 int svr4_add_socket __P((struct proc *, const char *, struct stat *));
 
diff --git a/sys/compat/svr4/svr4_stat.c b/sys/compat/svr4/svr4_stat.c
index 6ceb58e0e041..0d8a65a1e285 100644
--- a/sys/compat/svr4/svr4_stat.c
+++ b/sys/compat/svr4/svr4_stat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_stat.c,v 1.53 2005/07/28 03:50:52 christos Exp $	 */
+/*	$NetBSD: svr4_stat.c,v 1.54 2005/08/19 02:03:58 christos Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_stat.c,v 1.53 2005/07/28 03:50:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_stat.c,v 1.54 2005/08/19 02:03:58 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -188,7 +188,7 @@ svr4_sys_stat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_stat	svr4_st;
-	struct sys___stat13_args	cup;
+	struct sys___stat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -196,7 +196,7 @@ svr4_sys_stat(l, v, retval)
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 	SCARG(&cup, path) = SCARG(uap, path);
 
-	if ((error = sys___stat13(l, &cup, retval)) != 0)
+	if ((error = sys___stat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof st)) != 0)
@@ -233,7 +233,7 @@ svr4_sys_lstat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_stat	svr4_st;
-	struct sys___lstat13_args	cup;
+	struct sys___lstat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -241,7 +241,7 @@ svr4_sys_lstat(l, v, retval)
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 	SCARG(&cup, path) = SCARG(uap, path);
 
-	if ((error = sys___lstat13(l, &cup, retval)) != 0)
+	if ((error = sys___lstat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof st)) != 0)
@@ -278,7 +278,7 @@ svr4_sys_fstat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_stat	svr4_st;
-	struct sys___fstat13_args	cup;
+	struct sys___fstat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -286,7 +286,7 @@ svr4_sys_fstat(l, v, retval)
 	SCARG(&cup, fd) = SCARG(uap, fd);
 	SCARG(&cup, sb) = stackgap_alloc(p, &sg, sizeof(struct stat));
 
-	if ((error = sys___fstat13(l, &cup, retval)) != 0)
+	if ((error = sys___fstat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, sb), &st, sizeof st)) != 0)
@@ -312,7 +312,7 @@ svr4_sys_xstat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_xstat	svr4_st;
-	struct sys___stat13_args	cup;
+	struct sys___stat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -321,7 +321,7 @@ svr4_sys_xstat(l, v, retval)
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 	SCARG(&cup, path) = SCARG(uap, path);
 
-	if ((error = sys___stat13(l, &cup, retval)) != 0)
+	if ((error = sys___stat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof st)) != 0)
@@ -349,7 +349,7 @@ svr4_sys_lxstat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_xstat	svr4_st;
-	struct sys___lstat13_args	cup;
+	struct sys___lstat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -358,7 +358,7 @@ svr4_sys_lxstat(l, v, retval)
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 	SCARG(&cup, path) = SCARG(uap, path);
 
-	if ((error = sys___lstat13(l, &cup, retval)) != 0)
+	if ((error = sys___lstat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof st)) != 0)
@@ -386,7 +386,7 @@ svr4_sys_fxstat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_xstat	svr4_st;
-	struct sys___fstat13_args	cup;
+	struct sys___fstat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -394,7 +394,7 @@ svr4_sys_fxstat(l, v, retval)
 	SCARG(&cup, fd) = SCARG(uap, fd);
 	SCARG(&cup, sb) = stackgap_alloc(p, &sg, sizeof(struct stat));
 
-	if ((error = sys___fstat13(l, &cup, retval)) != 0)
+	if ((error = sys___fstat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, sb), &st, sizeof st)) != 0)
@@ -419,7 +419,7 @@ svr4_sys_stat64(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_stat64	svr4_st;
-	struct sys___stat13_args	cup;
+	struct sys___stat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -428,7 +428,7 @@ svr4_sys_stat64(l, v, retval)
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 	SCARG(&cup, path) = SCARG(uap, path);
 
-	if ((error = sys___stat13(l, &cup, retval)) != 0)
+	if ((error = sys___stat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof st)) != 0)
@@ -456,7 +456,7 @@ svr4_sys_lstat64(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_stat64	svr4_st;
-	struct sys___lstat13_args	cup;
+	struct sys___lstat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -465,7 +465,7 @@ svr4_sys_lstat64(l, v, retval)
 	CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));
 	SCARG(&cup, path) = SCARG(uap, path);
 
-	if ((error = sys___lstat13(l, &cup, retval)) != 0)
+	if ((error = sys___lstat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof st)) != 0)
@@ -493,7 +493,7 @@ svr4_sys_fstat64(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_stat64	svr4_st;
-	struct sys___fstat13_args	cup;
+	struct sys___fstat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -501,7 +501,7 @@ svr4_sys_fstat64(l, v, retval)
 	SCARG(&cup, fd) = SCARG(uap, fd);
 	SCARG(&cup, sb) = stackgap_alloc(p, &sg, sizeof(struct stat));
 
-	if ((error = sys___fstat13(l, &cup, retval)) != 0)
+	if ((error = sys___fstat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, sb), &st, sizeof st)) != 0)
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index 8f9336b558a4..fa97d35d220b 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_stream.c,v 1.53 2005/02/26 23:10:21 perry Exp $	 */
+/*	$NetBSD: svr4_stream.c,v 1.54 2005/08/19 02:03:58 christos Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.53 2005/02/26 23:10:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_stream.c,v 1.54 2005/08/19 02:03:58 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -279,7 +279,7 @@ clean_pipe(l, path)
 	const char *path;
 {
 	struct proc *p = l->l_proc;
-	struct sys___lstat13_args la;
+	struct sys___lstat30_args la;
 	struct sys_unlink_args ua;
 	register_t retval;
 	struct stat st;
@@ -296,7 +296,7 @@ clean_pipe(l, path)
 
 	SCARG(&la, path) = tpath;
 
-	if ((error = sys___lstat13(l, &la, &retval)) != 0)
+	if ((error = sys___lstat30(l, &la, &retval)) != 0)
 		return 0;
 
 	if ((error = copyin(SCARG(&la, ub), &st, sizeof(st))) != 0)
@@ -1601,7 +1601,7 @@ svr4_sys_putmsg(l, v, retval)
 		else {
 			/* Maybe we've been given a device/inode pair */
 			dev_t *dev = SVR4_ADDROF(&sc);
-			ino_t *ino = (ino_t *) &dev[1];
+			svr4_ino_t *ino = (svr4_ino_t *) &dev[1];
 			skp = svr4_find_socket(p, fp, *dev, *ino);
 			if (skp == NULL) {
 				skp = &saun;
diff --git a/sys/compat/svr4_32/svr4_32_socket.c b/sys/compat/svr4_32/svr4_32_socket.c
index 379b341eff3c..7704b0076f2c 100644
--- a/sys/compat/svr4_32/svr4_32_socket.c
+++ b/sys/compat/svr4_32/svr4_32_socket.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_socket.c,v 1.4 2003/01/19 16:47:15 thorpej Exp $	*/
+/*	$NetBSD: svr4_32_socket.c,v 1.5 2005/08/19 02:04:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_socket.c,v 1.4 2003/01/19 16:47:15 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_socket.c,v 1.5 2005/08/19 02:04:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -78,7 +78,7 @@ struct svr4_sockcache_entry {
 	void *cookie;		/* Internal cookie used for matching	*/
 	struct sockaddr_un sock;/* Pathname for the socket		*/
 	dev_t dev;		/* Device where the socket lives on	*/
-	ino_t ino;		/* Inode where the socket lives on	*/
+	svr4_ino_t ino;		/* Inode where the socket lives on	*/
 	TAILQ_ENTRY(svr4_sockcache_entry) entries;
 };
 
@@ -91,7 +91,7 @@ svr4_32_find_socket(p, fp, dev, ino)
 	struct proc *p;
 	struct file *fp;
 	dev_t dev;
-	ino_t ino;
+	svr4_ino_t ino;
 {
 	struct svr4_sockcache_entry *e;
 	void *cookie = ((struct socket *) fp->f_data)->so_internal;
diff --git a/sys/compat/svr4_32/svr4_32_socket.h b/sys/compat/svr4_32/svr4_32_socket.h
index fee4ce5c48f2..9c041c0c1389 100644
--- a/sys/compat/svr4_32/svr4_32_socket.h
+++ b/sys/compat/svr4_32/svr4_32_socket.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_socket.h,v 1.1 2001/02/06 16:37:58 eeh Exp $	*/
+/*	$NetBSD: svr4_32_socket.h,v 1.2 2005/08/19 02:04:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@ struct proc;
 struct file;
 
 struct sockaddr_un *svr4_find_socket __P((struct proc *, struct file *,
-    dev_t, ino_t));
+    dev_t, svr4_ino_t));
 void svr4_delete_socket __P((struct proc *, struct file *));
 int svr4_add_socket __P((struct proc *, const char *, struct stat *));
 
diff --git a/sys/compat/svr4_32/svr4_32_stat.c b/sys/compat/svr4_32/svr4_32_stat.c
index d5330b08cbf1..75666bb9db03 100644
--- a/sys/compat/svr4_32/svr4_32_stat.c
+++ b/sys/compat/svr4_32/svr4_32_stat.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_stat.c,v 1.16 2005/07/28 03:50:52 christos Exp $	 */
+/*	$NetBSD: svr4_32_stat.c,v 1.17 2005/08/19 02:04:03 christos Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_stat.c,v 1.16 2005/07/28 03:50:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_stat.c,v 1.17 2005/08/19 02:04:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -321,7 +321,7 @@ svr4_32_sys_xstat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_32_xstat	svr4_st;
-	struct sys___stat13_args	cup;
+	struct sys___stat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -330,7 +330,7 @@ svr4_32_sys_xstat(l, v, retval)
 	SCARG(&cup, path) = (const char *)(u_long)SCARG(uap, path);
 	CHECK_ALT_EXIST(p, &sg, SCARG(&cup, path));
 
-	if ((error = sys___stat13(l, &cup, retval)) != 0)
+	if ((error = sys___stat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof st)) != 0)
@@ -360,7 +360,7 @@ svr4_32_sys_lxstat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_32_xstat	svr4_st;
-	struct sys___lstat13_args	cup;
+	struct sys___lstat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -369,7 +369,7 @@ svr4_32_sys_lxstat(l, v, retval)
 	SCARG(&cup, path) = (const char *)(u_long)SCARG(uap, path);
 	CHECK_ALT_EXIST(p, &sg, SCARG(&cup, path));
 
-	if ((error = sys___lstat13(l, &cup, retval)) != 0)
+	if ((error = sys___lstat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof st)) != 0)
@@ -399,7 +399,7 @@ svr4_32_sys_fxstat(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_32_xstat	svr4_st;
-	struct sys___fstat13_args	cup;
+	struct sys___fstat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -407,7 +407,7 @@ svr4_32_sys_fxstat(l, v, retval)
 	SCARG(&cup, fd) = SCARG(uap, fd);
 	SCARG(&cup, sb) = stackgap_alloc(p, &sg, sizeof(struct stat));
 
-	if ((error = sys___fstat13(l, &cup, retval)) != 0)
+	if ((error = sys___fstat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, sb), &st, sizeof st)) != 0)
@@ -433,7 +433,7 @@ svr4_32_sys_stat64(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_32_stat64	svr4_st;
-	struct sys___stat13_args	cup;
+	struct sys___stat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -442,7 +442,7 @@ svr4_32_sys_stat64(l, v, retval)
 	SCARG(&cup, path) = (const char *)(u_long)SCARG(uap, path);
 	CHECK_ALT_EXIST(p, &sg, SCARG(&cup, path));
 
-	if ((error = sys___stat13(l, &cup, retval)) != 0)
+	if ((error = sys___stat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof st)) != 0)
@@ -472,7 +472,7 @@ svr4_32_sys_lstat64(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_32_stat64	svr4_st;
-	struct sys___lstat13_args	cup;
+	struct sys___lstat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -481,7 +481,7 @@ svr4_32_sys_lstat64(l, v, retval)
 	SCARG(&cup, path) = (const char *)(u_long)SCARG(uap, path);
 	CHECK_ALT_EXIST(p, &sg, SCARG(&cup, path));
 
-	if ((error = sys___lstat13(l, &cup, retval)) != 0)
+	if ((error = sys___lstat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, ub), &st, sizeof st)) != 0)
@@ -511,7 +511,7 @@ svr4_32_sys_fstat64(l, v, retval)
 	struct proc *p = l->l_proc;
 	struct stat		st;
 	struct svr4_32_stat64	svr4_st;
-	struct sys___fstat13_args	cup;
+	struct sys___fstat30_args	cup;
 	int			error;
 
 	caddr_t sg = stackgap_init(p, 0);
@@ -519,7 +519,7 @@ svr4_32_sys_fstat64(l, v, retval)
 	SCARG(&cup, fd) = SCARG(uap, fd);
 	SCARG(&cup, sb) = stackgap_alloc(p, &sg, sizeof(struct stat));
 
-	if ((error = sys___fstat13(l, &cup, retval)) != 0)
+	if ((error = sys___fstat30(l, &cup, retval)) != 0)
 		return error;
 
 	if ((error = copyin(SCARG(&cup, sb), &st, sizeof st)) != 0)
diff --git a/sys/compat/svr4_32/svr4_32_stream.c b/sys/compat/svr4_32/svr4_32_stream.c
index 96d68a97c4e8..5b0c09b79e00 100644
--- a/sys/compat/svr4_32/svr4_32_stream.c
+++ b/sys/compat/svr4_32/svr4_32_stream.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_stream.c,v 1.14 2005/02/26 23:10:21 perry Exp $	 */
+/*	$NetBSD: svr4_32_stream.c,v 1.15 2005/08/19 02:04:03 christos Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_stream.c,v 1.14 2005/02/26 23:10:21 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_stream.c,v 1.15 2005/08/19 02:04:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -279,7 +279,7 @@ clean_pipe(l, path)
 	struct lwp *l;
 	const char *path;
 {
-	struct sys___lstat13_args la;
+	struct sys___lstat30_args la;
 	struct proc *p = l->l_proc;
 	struct sys_unlink_args ua;
 	register_t retval;
@@ -297,7 +297,7 @@ clean_pipe(l, path)
 
 	SCARG(&la, path) = tpath;
 
-	if ((error = sys___lstat13(l, &la, &retval)) != 0)
+	if ((error = sys___lstat30(l, &la, &retval)) != 0)
 		return 0;
 
 	if ((error = copyin(SCARG(&la, ub), &st, sizeof(st))) != 0)
@@ -1589,7 +1589,7 @@ svr4_32_sys_putmsg(l, v, retval)
 		else {
 			/* Maybe we've been given a device/inode pair */
 			dev_t *dev = SVR4_ADDROF(&sc);
-			ino_t *ino = (ino_t *) &dev[1];
+			svr4_ino_t *ino = (svr4_ino_t *) &dev[1];
 			skp = svr4_find_socket(p, fp, *dev, *ino);
 			if (skp == NULL) {
 				skp = &saun;
diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c
index ce0bf6248460..bcb3ddf4ba0b 100644
--- a/sys/compat/ultrix/ultrix_misc.c
+++ b/sys/compat/ultrix/ultrix_misc.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ultrix_misc.c,v 1.101 2005/07/10 04:23:30 christos Exp $	*/
+/*	$NetBSD: ultrix_misc.c,v 1.102 2005/08/19 02:04:03 christos Exp $	*/
 
 /*
  * Copyright (c) 1995, 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ultrix_misc.c,v 1.101 2005/07/10 04:23:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_misc.c,v 1.102 2005/08/19 02:04:03 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_nfsserver.h"
@@ -495,7 +495,7 @@ ultrix_sys_nfssvc(struct lwp *l, void *v, register_t *retval)
 
 struct ultrix_ustat {
 	daddr_t	f_tfree;	/* total free */
-	ino_t	f_tinode;	/* total inodes free */
+	uint32_t f_tinode;	/* total inodes free */
 	char	f_fname[6];	/* filsys name */
 	char	f_fpack[6];	/* filsys pack name */
 };
diff --git a/sys/conf/files b/sys/conf/files
index 1045c9a4d4ad..3ef0e4d1723f 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.728 2005/07/31 04:04:46 yamt Exp $
+#	$NetBSD: files,v 1.729 2005/08/19 02:04:03 christos Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -97,7 +97,8 @@ defflag				COMPAT_DARWIN
 defflag				COMPAT_VAX1K
 defflag				COMPAT_43
 defflag				COMPAT_PECOFF
-defflag	opt_compat_netbsd.h	COMPAT_20
+defflag	opt_compat_netbsd.h	COMPAT_30
+defflag	opt_compat_netbsd.h	COMPAT_20: COMPAT_30
 defflag	opt_compat_netbsd.h	COMPAT_16: COMPAT_20
 defflag	opt_compat_netbsd.h	COMPAT_15: COMPAT_16
 defflag	opt_compat_netbsd.h	COMPAT_14: COMPAT_15
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c
index 159f5cdc42ce..62d5343c4647 100644
--- a/sys/dev/vnd.c
+++ b/sys/dev/vnd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: vnd.c,v 1.119 2005/08/18 22:06:25 nathanw Exp $	*/
+/*	$NetBSD: vnd.c,v 1.120 2005/08/19 02:04:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.119 2005/08/18 22:06:25 nathanw Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vnd.c,v 1.120 2005/08/19 02:04:03 christos Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "fs_nfs.h"
@@ -801,6 +801,26 @@ vndwrite(dev_t dev, struct uio *uio, int flags)
 	return (physio(vndstrategy, NULL, dev, B_WRITE, minphys, uio));
 }
 
+static int
+vnd_cget(struct proc *p, int unit, int *un, struct vattr *va)
+{
+	struct vnd_softc *vnd;
+
+	if (*un == -1)
+		*un = unit;
+	if (*un >= numvnd)
+		return ENXIO;
+	if (*un < 0)
+		return EINVAL;
+
+	vnd = &vnd_softc[*un];
+
+	if ((vnd->sc_flags & VNF_INITED) == 0)
+		return 0;
+
+	return VOP_GETATTR(vnd->sc_vp, va, p->p_ucred, p);
+}
+
 /* ARGSUSED */
 static int
 vndioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
@@ -1163,34 +1183,44 @@ unlock_and_exit:
 
 		break;
 
-	case VNDIOCGET: {
-		struct vnd_user *vnu;
+#ifdef COMPAT_30
+	case VNDIOOCGET: {
+		struct vnd_ouser *vnu;
 		struct vattr va;
-
-		vnu = (struct vnd_user *)data;
-
-		if (vnu->vnu_unit == -1)
-			vnu->vnu_unit = unit;
-		if (vnu->vnu_unit >= numvnd)
-			return (ENXIO);
-		if (vnu->vnu_unit < 0)
-			return (EINVAL);
-
-		vnd = &vnd_softc[vnu->vnu_unit];
-
-		if (vnd->sc_flags & VNF_INITED) {
-			error = VOP_GETATTR(vnd->sc_vp, &va, p->p_ucred, p);
-			if (error)
-				return (error);
+		vnu = (struct vnd_ouser *)data;
+		switch (error = vnd_cget(p, unit, &vnu->vnu_unit, &va)) {
+		case 0:
 			vnu->vnu_dev = va.va_fsid;
 			vnu->vnu_ino = va.va_fileid;
-		}
-		else {
+			break;
+		case -1:
 			/* unused is not an error */
 			vnu->vnu_dev = 0;
 			vnu->vnu_ino = 0;
+			break;
+		default:
+			return error;
+		}
+		break;
+	}
+#endif
+	case VNDIOCGET: {
+		struct vnd_user *vnu;
+		struct vattr va;
+		vnu = (struct vnd_user *)data;
+		switch (error = vnd_cget(p, unit, &vnu->vnu_unit, &va)) {
+		case 0:
+			vnu->vnu_dev = va.va_fsid;
+			vnu->vnu_ino = va.va_fileid;
+			break;
+		case -1:
+			/* unused is not an error */
+			vnu->vnu_dev = 0;
+			vnu->vnu_ino = 0;
+			break;
+		default:
+			return error;
 		}
-
 		break;
 	}
 
diff --git a/sys/dev/vndvar.h b/sys/dev/vndvar.h
index 7cfbc2eafe25..1a0d35ecd775 100644
--- a/sys/dev/vndvar.h
+++ b/sys/dev/vndvar.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vndvar.h,v 1.15 2005/07/17 00:08:27 hubertf Exp $	*/
+/*	$NetBSD: vndvar.h,v 1.16 2005/08/19 02:04:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -197,6 +197,15 @@ struct vnd_comp_header
 /*
  * A simple structure for describing which vnd units are in use.
  */
+#ifdef COMPAT_30
+struct vnd_ouser {
+	int		vnu_unit;	/* which vnd unit */
+	dev_t		vnu_dev;	/* file is on this device... */
+	uint32_t	vnu_ino;	/* ...at this inode */
+};
+#define VNDIOOCGET	_IOWR('F', 2, struct vnd_ouser)	/* get list */
+#endif
+
 struct vnd_user {
 	int		vnu_unit;	/* which vnd unit */
 	dev_t		vnu_dev;	/* file is on this device... */
@@ -211,4 +220,4 @@ struct vnd_user {
  */
 #define VNDIOCSET	_IOWR('F', 0, struct vnd_ioctl)	/* enable disk */
 #define VNDIOCCLR	_IOW('F', 1, struct vnd_ioctl)	/* disable disk */
-#define VNDIOCGET	_IOWR('F', 2, struct vnd_user)	/* get list */
+#define VNDIOCGET	_IOWR('F', 3, struct vnd_user)	/* get list */
diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index c80d8a5fcb1b..ddc978f1750c 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: cd9660_vnops.c,v 1.13 2005/06/23 17:00:30 thorpej Exp $	*/
+/*	$NetBSD: cd9660_vnops.c,v 1.14 2005/08/19 02:04:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1994
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.13 2005/06/23 17:00:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cd9660_vnops.c,v 1.14 2005/08/19 02:04:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -330,7 +330,7 @@ iso_uiodir(idp, dp, off)
 	int error;
 
 	dp->d_name[dp->d_namlen] = 0;
-	dp->d_reclen = DIRENT_SIZE(dp);
+	dp->d_reclen = _DIRENT_SIZE(dp);
 
 	if (idp->uio->uio_resid < dp->d_reclen) {
 		idp->eofflag = 0;
@@ -396,7 +396,7 @@ iso_shipdir(idp)
 			}
 		}
 	}
-	idp->current.d_reclen = DIRENT_SIZE(&idp->current);
+	idp->current.d_reclen = _DIRENT_SIZE(&idp->current);
 	if (assoc) {
 		idp->assocoff = idp->curroff;
 		memcpy(&idp->assocent, &idp->current, idp->current.d_reclen);
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index 78709a42a0ff..aeb198d86862 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: msdosfs_vnops.c,v 1.14 2005/02/26 22:58:55 perry Exp $	*/
+/*	$NetBSD: msdosfs_vnops.c,v 1.15 2005/08/19 02:04:03 christos Exp $	*/
 
 /*-
  * Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.14 2005/02/26 22:58:55 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.15 2005/08/19 02:04:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1511,7 +1511,7 @@ msdosfs_readdir(v)
 					    sizeof(dirbuf.d_name));
 					break;
 				}
-				dirbuf.d_reclen = DIRENT_SIZE(&dirbuf);
+				dirbuf.d_reclen = _DIRENT_SIZE(&dirbuf);
 				if (uio->uio_resid < dirbuf.d_reclen)
 					goto out;
 				error = uiomove(&dirbuf,
@@ -1623,7 +1623,7 @@ msdosfs_readdir(v)
 			else
 				dirbuf.d_name[dirbuf.d_namlen] = 0;
 			chksum = -1;
-			dirbuf.d_reclen = DIRENT_SIZE(&dirbuf);
+			dirbuf.d_reclen = _DIRENT_SIZE(&dirbuf);
 			if (uio->uio_resid < dirbuf.d_reclen) {
 				brelse(bp);
 				goto out;
diff --git a/sys/fs/ntfs/ntfs_subr.c b/sys/fs/ntfs/ntfs_subr.c
index fd5eec6f89b2..3c676556e134 100644
--- a/sys/fs/ntfs/ntfs_subr.c
+++ b/sys/fs/ntfs/ntfs_subr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ntfs_subr.c,v 1.17 2005/07/25 00:48:22 christos Exp $	*/
+/*	$NetBSD: ntfs_subr.c,v 1.18 2005/08/19 02:04:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 Semen Ustimenko (semenu@FreeBSD.org)
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.17 2005/07/25 00:48:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_subr.c,v 1.18 2005/08/19 02:04:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -128,8 +128,8 @@ ntfs_findvattr(ntmp, ip, lvapp, vapp, type, name, namelen, vcn)
 		       ip->i_number));
 		error = ntfs_loadntnode(ntmp,ip);
 		if (error) {
-			printf("ntfs_findvattr: FAILED TO LOAD INO: %d\n",
-			       ip->i_number);
+			printf("ntfs_findvattr: FAILED TO LOAD INO: %llu\n",
+			    (unsigned long long)ip->i_number);
 			return (error);
 		}
 	}
@@ -346,8 +346,8 @@ ntfs_loadntnode(
 		ap = (struct attr *) ((caddr_t)mfrp + off);
 	}
 	if (error) {
-		printf("ntfs_loadntnode: failed to load attr ino: %d\n",
-		       ip->i_number);
+		printf("ntfs_loadntnode: failed to load attr ino: %llu\n",
+		    (unsigned long long)ip->i_number);
 		goto out;
 	}
 
@@ -457,8 +457,8 @@ ntfs_ntput(ip)
 
 #ifdef DIAGNOSTIC
 	if (ip->i_usecount < 0) {
-		panic("ntfs_ntput: ino: %d usecount: %d ",
-		      ip->i_number,ip->i_usecount);
+		panic("ntfs_ntput: ino: %llu usecount: %d ",
+		    (unsigned long long)ip->i_number, ip->i_usecount);
 	}
 #endif
 
@@ -512,8 +512,8 @@ ntfs_ntrele(ip)
 	ip->i_usecount--;
 
 	if (ip->i_usecount < 0)
-		panic("ntfs_ntrele: ino: %d usecount: %d ",
-		      ip->i_number,ip->i_usecount);
+		panic("ntfs_ntrele: ino: %llu usecount: %d ",
+		    (unsigned long long)ip->i_number, ip->i_usecount);
 	simple_unlock(&ip->i_interlock);
 }
 
diff --git a/sys/fs/ntfs/ntfs_vfsops.c b/sys/fs/ntfs/ntfs_vfsops.c
index 99fd3d90acb3..c3decfd12517 100644
--- a/sys/fs/ntfs/ntfs_vfsops.c
+++ b/sys/fs/ntfs/ntfs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ntfs_vfsops.c,v 1.31 2005/06/28 09:30:37 yamt Exp $	*/
+/*	$NetBSD: ntfs_vfsops.c,v 1.32 2005/08/19 02:04:03 christos Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999 Semen Ustimenko
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.31 2005/06/28 09:30:37 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vfsops.c,v 1.32 2005/08/19 02:04:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -893,8 +893,8 @@ ntfs_vgetex(
 	if (!(flags & VG_DONTLOADIN) && !(ip->i_flag & IN_LOADED)) {
 		error = ntfs_loadntnode(ntmp, ip);
 		if(error) {
-			printf("ntfs_vget: CAN'T LOAD ATTRIBUTES FOR INO: %d\n",
-			       ip->i_number);
+			printf("ntfs_vget: CAN'T LOAD ATTRIBUTES FOR INO:"
+			    " %llu\n", (unsigned long long)ip->i_number);
 			ntfs_ntput(ip);
 			return (error);
 		}
diff --git a/sys/fs/ntfs/ntfs_vnops.c b/sys/fs/ntfs/ntfs_vnops.c
index 0cb4c53f93b9..ce6ddf985d8a 100644
--- a/sys/fs/ntfs/ntfs_vnops.c
+++ b/sys/fs/ntfs/ntfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ntfs_vnops.c,v 1.22 2005/07/25 00:48:22 christos Exp $	*/
+/*	$NetBSD: ntfs_vnops.c,v 1.23 2005/08/19 02:04:03 christos Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.22 2005/07/25 00:48:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ntfs_vnops.c,v 1.23 2005/08/19 02:04:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -306,8 +306,9 @@ ntfs_print(ap)
 {
 	struct ntnode *ip = VTONT(ap->a_vp);
 
-	printf("tag VT_NTFS, ino %u, flag %#x, usecount %d, nlink %ld\n",
-	    ip->i_number, ip->i_flag, ip->i_usecount, ip->i_nlink);
+	printf("tag VT_NTFS, ino %llu, flag %#x, usecount %d, nlink %ld\n",
+	    (unsigned long long)ip->i_number, ip->i_flag, ip->i_usecount,
+	    ip->i_nlink);
 	printf("       ");
 	lockmgr_printinfo(ap->a_vp->v_vnlock);
 	printf("\n");
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 52cf8fb96ac4..5cea5d71f74a 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysent.c,v 1.165 2005/07/10 22:05:24 thorpej Exp $ */
+/* $NetBSD: init_sysent.c,v 1.166 2005/08/19 02:04:03 christos Exp $ */
 
 /*
  * System call switch table.
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.165 2005/07/10 22:05:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.166 2005/08/19 02:04:03 christos Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_nfsserver.h"
@@ -86,6 +86,12 @@ __KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.165 2005/07/10 22:05:24 thorpej Ex
 #define	compat_20(func) sys_nosys
 #endif
 
+#ifdef COMPAT_30
+#define	compat_30(func) __CONCAT(compat_30_,func)
+#else
+#define	compat_30(func) sys_nosys
+#endif
+
 #define	s(type)	sizeof(type)
 
 struct sysent sysent[] = {
@@ -768,8 +774,8 @@ struct sysent sysent[] = {
 	    sys___posix_rename },		/* 270 = __posix_rename */
 	{ 3, s(struct sys_swapctl_args), 0,
 	    sys_swapctl },			/* 271 = swapctl */
-	{ 3, s(struct sys_getdents_args), 0,
-	    sys_getdents },			/* 272 = getdents */
+	{ 3, s(struct compat_30_sys_getdents_args), 0,
+	    compat_30(sys_getdents) },		/* 272 = compat_30 getdents */
 	{ 3, s(struct sys_minherit_args), 0,
 	    sys_minherit },			/* 273 = minherit */
 	{ 2, s(struct sys_lchmod_args), 0,
@@ -780,12 +786,12 @@ struct sysent sysent[] = {
 	    sys_lutimes },			/* 276 = lutimes */
 	{ 3, s(struct sys___msync13_args), 0,
 	    sys___msync13 },			/* 277 = __msync13 */
-	{ 2, s(struct sys___stat13_args), 0,
-	    sys___stat13 },			/* 278 = __stat13 */
-	{ 2, s(struct sys___fstat13_args), 0,
-	    sys___fstat13 },			/* 279 = __fstat13 */
-	{ 2, s(struct sys___lstat13_args), 0,
-	    sys___lstat13 },			/* 280 = __lstat13 */
+	{ 2, s(struct compat_30_sys___stat13_args), 0,
+	    compat_30(sys___stat13) },		/* 278 = compat_30 __stat13 */
+	{ 2, s(struct compat_30_sys___fstat13_args), 0,
+	    compat_30(sys___fstat13) },		/* 279 = compat_30 __fstat13 */
+	{ 2, s(struct compat_30_sys___lstat13_args), 0,
+	    compat_30(sys___lstat13) },		/* 280 = compat_30 __lstat13 */
 	{ 2, s(struct sys___sigaltstack14_args), 0,
 	    sys___sigaltstack14 },		/* 281 = __sigaltstack14 */
 	{ 0, 0, 0,
@@ -1018,14 +1024,14 @@ struct sysent sysent[] = {
 	    sys_lremovexattr },			/* 385 = lremovexattr */
 	{ 2, s(struct sys_fremovexattr_args), 0,
 	    sys_fremovexattr },			/* 386 = fremovexattr */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 387 = filler */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 388 = filler */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 389 = filler */
-	{ 0, 0, 0,
-	    sys_nosys },			/* 390 = filler */
+	{ 2, s(struct sys___stat30_args), 0,
+	    sys___stat30 },			/* 387 = __stat30 */
+	{ 2, s(struct sys___fstat30_args), 0,
+	    sys___fstat30 },			/* 388 = __fstat30 */
+	{ 2, s(struct sys___lstat30_args), 0,
+	    sys___lstat30 },			/* 389 = __lstat30 */
+	{ 3, s(struct sys___getdents30_args), 0,
+	    sys___getdents30 },			/* 390 = __getdents30 */
 	{ 0, 0, 0,
 	    sys_nosys },			/* 391 = filler */
 	{ 0, 0, 0,
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index d8075fc0f67f..cfd04a01ee57 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_descrip.c,v 1.134 2005/06/23 23:15:12 thorpej Exp $	*/
+/*	$NetBSD: kern_descrip.c,v 1.135 2005/08/19 02:04:03 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.134 2005/06/23 23:15:12 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.135 2005/08/19 02:04:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -716,9 +716,9 @@ sys_close(struct lwp *l, void *v, register_t *retval)
  */
 /* ARGSUSED */
 int
-sys___fstat13(struct lwp *l, void *v, register_t *retval)
+sys___fstat30(struct lwp *l, void *v, register_t *retval)
 {
-	struct sys___fstat13_args /* {
+	struct sys___fstat30_args /* {
 		syscallarg(int)			fd;
 		syscallarg(struct stat *)	sb;
 	} */ *uap = v;