Module Name: src
Committed By: joerg
Date: Sat Mar 5 23:38:40 UTC 2011
Modified Files:
src/sys/arch/sgimips/conf: GENERIC32_IP12 GENERIC32_IP2x GENERIC32_IP3x
Log Message:
Disable COMPAT_IRIX and related code. The usefulness is under discussion
and code that dereferences pointer into userland without proper checking
needs a full audit.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sgimips/conf/GENERIC32_IP12
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/sgimips/conf/GENERIC32_IP2x
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/sgimips/conf/GENERIC32_IP3x
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/sgimips/conf/GENERIC32_IP12
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP12:1.8 src/sys/arch/sgimips/conf/GENERIC32_IP12:1.9
--- src/sys/arch/sgimips/conf/GENERIC32_IP12:1.8 Tue Nov 23 11:14:05 2010
+++ src/sys/arch/sgimips/conf/GENERIC32_IP12 Sat Mar 5 23:38:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP12,v 1.8 2010/11/23 11:14:05 hannken Exp $
+# $NetBSD: GENERIC32_IP12,v 1.9 2011/03/05 23:38:40 joerg Exp $
#
# GENERIC32_IP12 machine description file
#
@@ -32,7 +32,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.8 $"
+#ident "GENERIC32-IP2x-$Revision: 1.9 $"
maxusers 32
@@ -86,7 +86,7 @@
options COMPAT_50 # NetBSD 5.0 compatibility.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-options COMPAT_IRIX # binary compatibility with IRIX
+#options COMPAT_IRIX # binary compatibility with IRIX
#options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -283,8 +283,8 @@
#pseudo-device vcoda 4 # coda minicache <-> venus comm.
# pseudo devices used for IRIX binary compatibility
-pseudo-device irix_kmem # IRIX /dev/kmem
-pseudo-device irix_usema # IRIX /dev/usema
+#pseudo-device irix_kmem # IRIX /dev/kmem
+#pseudo-device irix_usema # IRIX /dev/usema
# Veriexec
#
Index: src/sys/arch/sgimips/conf/GENERIC32_IP2x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.84 src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.85
--- src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.84 Tue Nov 23 11:14:05 2010
+++ src/sys/arch/sgimips/conf/GENERIC32_IP2x Sat Mar 5 23:38:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP2x,v 1.84 2010/11/23 11:14:05 hannken Exp $
+# $NetBSD: GENERIC32_IP2x,v 1.85 2011/03/05 23:38:40 joerg Exp $
#
# GENERIC32_IP2x machine description file
#
@@ -29,7 +29,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32-IP2x-$Revision: 1.84 $"
+#ident "GENERIC32-IP2x-$Revision: 1.85 $"
maxusers 32
@@ -86,7 +86,7 @@
options COMPAT_50 # NetBSD 5.0 compatibility.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-options COMPAT_IRIX # binary compatibility with IRIX
+#options COMPAT_IRIX # binary compatibility with IRIX
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -329,8 +329,8 @@
pseudo-device vcoda 4 # coda minicache <-> venus comm.
# pseudo devices used for IRIX binary compatibility
-pseudo-device irix_kmem # IRIX /dev/kmem
-pseudo-device irix_usema # IRIX /dev/usema
+#pseudo-device irix_kmem # IRIX /dev/kmem
+#pseudo-device irix_usema # IRIX /dev/usema
# Veriexec
#
Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.86 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.87
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.86 Tue Nov 23 11:14:05 2010
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x Sat Mar 5 23:38:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.86 2010/11/23 11:14:05 hannken Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.87 2011/03/05 23:38:40 joerg Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC32_IP3x-$Revision: 1.86 $"
+#ident "GENERIC32_IP3x-$Revision: 1.87 $"
maxusers 32
@@ -79,7 +79,7 @@
options COMPAT_50 # NetBSD 5.0 compatibility.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-options COMPAT_IRIX # binary compatibility with IRIX
+#options COMPAT_IRIX # binary compatibility with IRIX
options COMPAT_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -475,8 +475,8 @@
pseudo-device vcoda 4 # coda minicache <-> venus comm.
# pseudo devices used for IRIX binary compatibility
-pseudo-device irix_kmem # IRIX /dev/kmem
-pseudo-device irix_usema # IRIX /dev/usema
+#pseudo-device irix_kmem # IRIX /dev/kmem
+#pseudo-device irix_usema # IRIX /dev/usema
# Veriexec
#
