Module Name: src Committed By: snj Date: Fri Jun 5 16:52:39 UTC 2015
Modified Files: src/sys/arch/i386/conf [netbsd-7]: GENERIC XEN3_DOM0 XEN3_DOMU Log Message: Pull up following revision(s) (requested by maxv in ticket #814): sys/arch/i386/conf/GENERIC: revision 1.1125 sys/arch/i386/conf/XEN3_DOM0: revision 1.95 sys/arch/i386/conf/XEN3_DOMU: revision 1.67 Disable COMPAT_FREEBSD. The implementation is poor, not well tested and almost irrelevant. People who need it (for tw_cli for example) can still recompile their kernels with this option. Discussed on tech-kern@ To generate a diff of this commit: cvs rdiff -u -r1.1107.2.7 -r1.1107.2.8 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.85.2.3 -r1.85.2.4 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.59.2.3 -r1.59.2.4 src/sys/arch/i386/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1107.2.7 src/sys/arch/i386/conf/GENERIC:1.1107.2.8 --- src/sys/arch/i386/conf/GENERIC:1.1107.2.7 Fri May 15 03:44:18 2015 +++ src/sys/arch/i386/conf/GENERIC Fri Jun 5 16:52:39 2015 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1107.2.7 2015/05/15 03:44:18 snj Exp $ +# $NetBSD: GENERIC,v 1.1107.2.8 2015/06/05 16:52:39 snj 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.1107.2.7 $" +#ident "GENERIC-$Revision: 1.1107.2.8 $" maxusers 64 # estimated number of users @@ -147,7 +147,7 @@ options COMPAT_OSSAUDIO # OSS (Voxware) options COMPAT_SVR4 # binary compatibility with SVR4 options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux -options COMPAT_FREEBSD # binary compatibility with FreeBSD +#options COMPAT_FREEBSD # binary compatibility with FreeBSD #options COMPAT_NDIS # NDIS network driver options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.3 src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.4 --- src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.3 Tue Nov 18 19:05:30 2014 +++ src/sys/arch/i386/conf/XEN3_DOM0 Fri Jun 5 16:52:39 2015 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.85.2.3 2014/11/18 19:05:30 snj Exp $ +# $NetBSD: XEN3_DOM0,v 1.85.2.4 2015/06/05 16:52:39 snj Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -97,7 +97,7 @@ options COMPAT_OSSAUDIO # OSS (Voxware) options COMPAT_SVR4 # binary compatibility with SVR4 options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux -options COMPAT_FREEBSD # binary compatibility with FreeBSD +#options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Wedge support Index: src/sys/arch/i386/conf/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.3 src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.4 --- src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.3 Tue Nov 18 19:05:30 2014 +++ src/sys/arch/i386/conf/XEN3_DOMU Fri Jun 5 16:52:39 2015 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.59.2.3 2014/11/18 19:05:30 snj Exp $ +# $NetBSD: XEN3_DOMU,v 1.59.2.4 2015/06/05 16:52:39 snj Exp $ include "arch/xen/conf/std.xen" @@ -83,7 +83,7 @@ options COMPAT_OSSAUDIO # OSS (Voxware) options COMPAT_SVR4 # binary compatibility with SVR4 options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux -options COMPAT_FREEBSD # binary compatibility with FreeBSD +#options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Wedge support