Module Name: src
Committed By: joerg
Date: Tue Apr 26 16:36:43 UTC 2011
Modified Files:
src/sys/arch/i386/conf: ALL
src/sys/arch/mips/conf: files.mips
src/sys/arch/mips/mips: sigcode.S
src/sys/arch/sgimips/conf: GENERIC32_IP12 GENERIC32_IP2x GENERIC32_IP3x
GENERIC64_IP2x GENERIC64_IP3x majors.sgimips
src/sys/conf: files
src/sys/kern: kern_exec.c kern_fork.c
src/sys/sys: sysctl.h
src/usr.bin/kdump: setemul.c
Removed Files:
src/sys/arch/mips/mips: irix_syscall.c
src/sys/compat/irix: Makefile files.irix irix_dirent.c irix_errno.c
irix_errno.h irix_exec.c irix_exec.h irix_exec_elf32.c
irix_exec_elf64.c irix_fcntl.c irix_fcntl.h irix_ioctl.c
irix_ioctl.h irix_kmem.c irix_kmem.h irix_misc.c irix_mman.c
irix_mman.h irix_mod.c irix_mount.c irix_prctl.c irix_prctl.h
irix_resource.c irix_resource.h irix_signal.c irix_signal.h
irix_stat.c irix_swap.c irix_swap.h irix_syscall.h
irix_syscallargs.h irix_syscalls.c irix_sysctl.c irix_sysctl.h
irix_sysent.c irix_sysmp.c irix_sysmp.h irix_syssgi.c irix_syssgi.h
irix_systeminfo.c irix_types.h irix_usema.c irix_usema.h
syscalls.conf syscalls.master
src/sys/modules/compat_irix: Makefile
Log Message:
Remove IRIX emulation
To generate a diff of this commit:
cvs rdiff -u -r1.304 -r1.305 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/mips/conf/files.mips
cvs rdiff -u -r1.4 -r0 src/sys/arch/mips/mips/irix_syscall.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/mips/sigcode.S
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sgimips/conf/GENERIC32_IP12
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/sgimips/conf/GENERIC32_IP2x
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sgimips/conf/GENERIC32_IP3x
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sgimips/conf/GENERIC64_IP2x \
src/sys/arch/sgimips/conf/GENERIC64_IP3x
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sgimips/conf/majors.sgimips
cvs rdiff -u -r1.5 -r0 src/sys/compat/irix/Makefile
cvs rdiff -u -r1.27 -r0 src/sys/compat/irix/files.irix
cvs rdiff -u -r1.25 -r0 src/sys/compat/irix/irix_dirent.c
cvs rdiff -u -r1.2 -r0 src/sys/compat/irix/irix_errno.c \
src/sys/compat/irix/irix_exec_elf64.c src/sys/compat/irix/irix_mman.h \
src/sys/compat/irix/irix_mod.c src/sys/compat/irix/irix_resource.h
cvs rdiff -u -r1.4 -r0 src/sys/compat/irix/irix_errno.h \
src/sys/compat/irix/irix_kmem.h src/sys/compat/irix/irix_swap.h \
src/sys/compat/irix/irix_sysmp.h src/sys/compat/irix/syscalls.conf
cvs rdiff -u -r1.59 -r0 src/sys/compat/irix/irix_exec.c
cvs rdiff -u -r1.28 -r0 src/sys/compat/irix/irix_exec.h \
src/sys/compat/irix/irix_fcntl.c
cvs rdiff -u -r1.16 -r0 src/sys/compat/irix/irix_exec_elf32.c \
src/sys/compat/irix/irix_systeminfo.c
cvs rdiff -u -r1.3 -r0 src/sys/compat/irix/irix_fcntl.h
cvs rdiff -u -r1.20 -r0 src/sys/compat/irix/irix_ioctl.c
cvs rdiff -u -r1.7 -r0 src/sys/compat/irix/irix_ioctl.h \
src/sys/compat/irix/irix_sysctl.c src/sys/compat/irix/irix_sysctl.h
cvs rdiff -u -r1.10 -r0 src/sys/compat/irix/irix_kmem.c
cvs rdiff -u -r1.12 -r0 src/sys/compat/irix/irix_misc.c
cvs rdiff -u -r1.24 -r0 src/sys/compat/irix/irix_mman.c \
src/sys/compat/irix/irix_mount.c src/sys/compat/irix/irix_stat.c
cvs rdiff -u -r1.52 -r0 src/sys/compat/irix/irix_prctl.c
cvs rdiff -u -r1.14 -r0 src/sys/compat/irix/irix_prctl.h \
src/sys/compat/irix/irix_usema.h
cvs rdiff -u -r1.15 -r0 src/sys/compat/irix/irix_resource.c
cvs rdiff -u -r1.57 -r0 src/sys/compat/irix/irix_signal.c
cvs rdiff -u -r1.18 -r0 src/sys/compat/irix/irix_signal.h
cvs rdiff -u -r1.21 -r0 src/sys/compat/irix/irix_swap.c
cvs rdiff -u -r1.61 -r0 src/sys/compat/irix/irix_syscall.h \
src/sys/compat/irix/irix_syscallargs.h \
src/sys/compat/irix/irix_syscalls.c src/sys/compat/irix/irix_sysent.c
cvs rdiff -u -r1.23 -r0 src/sys/compat/irix/irix_sysmp.c
cvs rdiff -u -r1.51 -r0 src/sys/compat/irix/irix_syssgi.c
cvs rdiff -u -r1.6 -r0 src/sys/compat/irix/irix_syssgi.h
cvs rdiff -u -r1.19 -r0 src/sys/compat/irix/irix_types.h
cvs rdiff -u -r1.34 -r0 src/sys/compat/irix/irix_usema.c
cvs rdiff -u -r1.54 -r0 src/sys/compat/irix/syscalls.master
cvs rdiff -u -r1.1008 -r1.1009 src/sys/conf/files
cvs rdiff -u -r1.313 -r1.314 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.181 -r1.182 src/sys/kern/kern_fork.c
cvs rdiff -u -r1.2 -r0 src/sys/modules/compat_irix/Makefile
cvs rdiff -u -r1.193 -r1.194 src/sys/sys/sysctl.h
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/kdump/setemul.c
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/ALL
diff -u src/sys/arch/i386/conf/ALL:1.304 src/sys/arch/i386/conf/ALL:1.305
--- src/sys/arch/i386/conf/ALL:1.304 Tue Apr 26 15:51:22 2011
+++ src/sys/arch/i386/conf/ALL Tue Apr 26 16:36:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.304 2011/04/26 15:51:22 joerg Exp $
+# $NetBSD: ALL,v 1.305 2011/04/26 16:36:40 joerg Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.304 $"
+#ident "ALL-$Revision: 1.305 $"
maxusers 64 # estimated number of users
@@ -1959,7 +1959,6 @@
options DEBUG_HPUX
options DEBUG_IBCS2
options DEBUG_IPR_VJ
-options DEBUG_IRIX
options DEBUG_ISAPNP
options DEBUG_ISSIGNAL
options DEBUG_KERNADDR_ACCESS
Index: src/sys/arch/mips/conf/files.mips
diff -u src/sys/arch/mips/conf/files.mips:1.68 src/sys/arch/mips/conf/files.mips:1.69
--- src/sys/arch/mips/conf/files.mips:1.68 Thu Apr 14 05:07:00 2011
+++ src/sys/arch/mips/conf/files.mips Tue Apr 26 16:36:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.mips,v 1.68 2011/04/14 05:07:00 cliff Exp $
+# $NetBSD: files.mips,v 1.69 2011/04/26 16:36:40 joerg Exp $
#
defflag opt_cputype.h NOFPU FPEMUL
@@ -94,6 +94,3 @@
include "compat/linux/arch/mips/files.linux_mips"
file arch/mips/mips/linux_trap.c compat_linux
file arch/mips/mips/linux_syscall.c compat_linux
-
-# IRIX compatibility (COMPAT_IRIX) XXX even more experimental
-include "compat/irix/files.irix"
Index: src/sys/arch/mips/mips/sigcode.S
diff -u src/sys/arch/mips/mips/sigcode.S:1.3 src/sys/arch/mips/mips/sigcode.S:1.4
--- src/sys/arch/mips/mips/sigcode.S:1.3 Sun Dec 11 12:18:09 2005
+++ src/sys/arch/mips/mips/sigcode.S Tue Apr 26 16:36:41 2011
@@ -1,9 +1,8 @@
-/* $NetBSD: sigcode.S,v 1.3 2005/12/11 12:18:09 christos Exp $ */
+/* $NetBSD: sigcode.S,v 1.4 2011/04/26 16:36:41 joerg Exp $ */
#include "opt_compat_netbsd.h"
#include "opt_compat_ultrix.h"
#include "opt_compat_linux.h"
-#include "opt_compat_irix.h"
#include <mips/signal.h>
#include <sys/syscall.h>
@@ -13,9 +12,6 @@
#ifdef COMPAT_LINUX
#include <compat/linux/linux_syscall.h>
#endif
-#ifdef COMPAT_IRIX
-#include <compat/irix/irix_syscall.h>
-#endif
#include <mips/asm.h>
#include "assym.h"
Index: src/sys/arch/sgimips/conf/GENERIC32_IP12
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP12:1.10 src/sys/arch/sgimips/conf/GENERIC32_IP12:1.11
--- src/sys/arch/sgimips/conf/GENERIC32_IP12:1.10 Sun Mar 6 17:08:30 2011
+++ src/sys/arch/sgimips/conf/GENERIC32_IP12 Tue Apr 26 16:36:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP12,v 1.10 2011/03/06 17:08:30 bouyer Exp $
+# $NetBSD: GENERIC32_IP12,v 1.11 2011/04/26 16:36:41 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.10 $"
+#ident "GENERIC32-IP2x-$Revision: 1.11 $"
maxusers 32
@@ -86,7 +86,6 @@
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_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -283,10 +282,6 @@
# a pseudo device needed for Coda # also needs CODA (above)
#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
-
# Veriexec
#
# a pseudo device needed for veriexec
Index: src/sys/arch/sgimips/conf/GENERIC32_IP2x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.86 src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.87
--- src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.86 Sun Mar 6 17:08:30 2011
+++ src/sys/arch/sgimips/conf/GENERIC32_IP2x Tue Apr 26 16:36:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP2x,v 1.86 2011/03/06 17:08:30 bouyer Exp $
+# $NetBSD: GENERIC32_IP2x,v 1.87 2011/04/26 16:36:41 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.86 $"
+#ident "GENERIC32-IP2x-$Revision: 1.87 $"
maxusers 32
@@ -86,7 +86,6 @@
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_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -329,10 +328,6 @@
# a pseudo device needed for Coda # also needs CODA (above)
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
-
# Veriexec
#
# a pseudo device needed for veriexec
Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.88 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.89
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.88 Sun Mar 6 17:08:31 2011
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x Tue Apr 26 16:36:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC32_IP3x,v 1.88 2011/03/06 17:08:31 bouyer Exp $
+# $NetBSD: GENERIC32_IP3x,v 1.89 2011/04/26 16:36:41 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.88 $"
+#ident "GENERIC32_IP3x-$Revision: 1.89 $"
maxusers 32
@@ -79,7 +79,6 @@
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_LINUX # binary compatibility with Linux
#options COMPAT_ULTRIX # binary compatibility with Ultrix
options COMPAT_BSDPTY # /dev/[pt]ty?? ptys.
@@ -475,10 +474,6 @@
# a pseudo device needed for Coda # also needs CODA (above)
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
-
# Veriexec
#
# a pseudo device needed for veriexec
Index: src/sys/arch/sgimips/conf/GENERIC64_IP2x
diff -u src/sys/arch/sgimips/conf/GENERIC64_IP2x:1.2 src/sys/arch/sgimips/conf/GENERIC64_IP2x:1.3
--- src/sys/arch/sgimips/conf/GENERIC64_IP2x:1.2 Mon Dec 14 00:46:12 2009
+++ src/sys/arch/sgimips/conf/GENERIC64_IP2x Tue Apr 26 16:36:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64_IP2x,v 1.2 2009/12/14 00:46:12 matt Exp $
+# $NetBSD: GENERIC64_IP2x,v 1.3 2011/04/26 16:36:41 joerg Exp $
#
# GENERIC32_IP2x machine description file
#
@@ -29,7 +29,7 @@
no makeoptions TEXTADDR # entry point
makeoptions TEXTADDR=0xffffffff88069000 # entry point
-#ident "GENERIC64-IP2x-$Revision: 1.2 $"
+#ident "GENERIC64-IP2x-$Revision: 1.3 $"
no makeoptions WANT_ECOFF
makeoptions WANT_ECOFF="no" # Create an ECOFF kernel in addition
@@ -45,7 +45,6 @@
#options COMPAT_40 # NetBSD 4.0 compatibility.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-#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.
Index: src/sys/arch/sgimips/conf/GENERIC64_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC64_IP3x:1.2 src/sys/arch/sgimips/conf/GENERIC64_IP3x:1.3
--- src/sys/arch/sgimips/conf/GENERIC64_IP3x:1.2 Mon Dec 14 00:46:12 2009
+++ src/sys/arch/sgimips/conf/GENERIC64_IP3x Tue Apr 26 16:36:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64_IP3x,v 1.2 2009/12/14 00:46:12 matt Exp $
+# $NetBSD: GENERIC64_IP3x,v 1.3 2011/04/26 16:36:41 joerg Exp $
#
# GENERIC32_IP3x machine description file
#
@@ -28,7 +28,7 @@
no makeoptions TEXTADDR
makeoptions TEXTADDR="0xffffffff80069000" # entry point
-#ident "GENERIC64_IP3x-$Revision: 1.2 $"
+#ident "GENERIC64_IP3x-$Revision: 1.3 $"
# Compatibility options
#options COMPAT_15 # NetBSD 1.5
@@ -38,7 +38,6 @@
#options COMPAT_40 # NetBSD 4.0 compatibility.
#options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended.
-#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.
Index: src/sys/arch/sgimips/conf/majors.sgimips
diff -u src/sys/arch/sgimips/conf/majors.sgimips:1.25 src/sys/arch/sgimips/conf/majors.sgimips:1.26
--- src/sys/arch/sgimips/conf/majors.sgimips:1.25 Sat Mar 6 23:45:40 2010
+++ src/sys/arch/sgimips/conf/majors.sgimips Tue Apr 26 16:36:41 2011
@@ -1,4 +1,4 @@
-# $NetBSD: majors.sgimips,v 1.25 2010/03/06 23:45:40 plunky Exp $
+# $NetBSD: majors.sgimips,v 1.26 2011/04/26 16:36:41 joerg Exp $
#
# Device majors for sgimips
#
@@ -51,8 +51,6 @@
device-major wsfont char 54 wsfont
device-major clockctl char 60 clockctl
-device-major irix_kmem char 61 compat_irix
-device-major irix_usema char 62 compat_irix
device-major audio char 64 audio
device-major pci char 65 pci
device-major irframe char 66 irframedrv
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1008 src/sys/conf/files:1.1009
--- src/sys/conf/files:1.1008 Tue Apr 26 15:51:31 2011
+++ src/sys/conf/files Tue Apr 26 16:36:42 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1008 2011/04/26 15:51:31 joerg Exp $
+# $NetBSD: files,v 1.1009 2011/04/26 16:36:42 joerg Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -138,7 +138,6 @@
defflag COMPAT_OSSAUDIO
defflag COMPAT_FREEBSD: COMPAT_30
defflag COMPAT_IBCS2
-defflag COMPAT_IRIX
defflag COMPAT_LINUX: COMPAT_16
defflag COMPAT_LINUX32 : COMPAT_LINUX
defflag COMPAT_OSF1
@@ -1300,8 +1299,6 @@
defpseudo sequencer
defpseudo clockctl
-defpseudo irix_kmem
-defpseudo irix_usema
#
# Accept filters. XXX should use another registration/initialization method.
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.313 src/sys/kern/kern_exec.c:1.314
--- src/sys/kern/kern_exec.c:1.313 Mon Mar 14 20:12:40 2011
+++ src/sys/kern/kern_exec.c Tue Apr 26 16:36:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.313 2011/03/14 20:12:40 jakllsch Exp $ */
+/* $NetBSD: kern_exec.c,v 1.314 2011/04/26 16:36:42 joerg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.313 2011/03/14 20:12:40 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.314 2011/04/26 16:36:42 joerg Exp $");
#include "opt_ktrace.h"
#include "opt_modular.h"
@@ -486,7 +486,6 @@
"compat_aoutm68k",
"compat_freebsd",
"compat_ibcs2",
- "compat_irix",
"compat_linux",
"compat_linux32",
"compat_netbsd32",
Index: src/sys/kern/kern_fork.c
diff -u src/sys/kern/kern_fork.c:1.181 src/sys/kern/kern_fork.c:1.182
--- src/sys/kern/kern_fork.c:1.181 Sun Apr 24 20:17:53 2011
+++ src/sys/kern/kern_fork.c Tue Apr 26 16:36:42 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_fork.c,v 1.181 2011/04/24 20:17:53 rmind Exp $ */
+/* $NetBSD: kern_fork.c,v 1.182 2011/04/26 16:36:42 joerg Exp $ */
/*-
* Copyright (c) 1999, 2001, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.181 2011/04/24 20:17:53 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_fork.c,v 1.182 2011/04/26 16:36:42 joerg Exp $");
#include "opt_ktrace.h"
@@ -360,9 +360,9 @@
/*
* p_limit (rlimit stuff) is usually copy-on-write, so we just need
* to bump pl_refcnt.
- * However in some cases (see compat irix, and plausibly from clone)
- * the parent and child share limits - in which case nothing else
- * must have a copy of the limits (PL_SHAREMOD is set).
+ * However in some cases like clone the parent and child
+ * share limits - in which case nothing else must have a copy
+ * of the limits (PL_SHAREMOD is set).
*/
if (__predict_false(flags & FORK_SHARELIMIT))
lim_privatise(p1, 1);
Index: src/sys/sys/sysctl.h
diff -u src/sys/sys/sysctl.h:1.193 src/sys/sys/sysctl.h:1.194
--- src/sys/sys/sysctl.h:1.193 Tue Apr 26 15:51:32 2011
+++ src/sys/sys/sysctl.h Tue Apr 26 16:36:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctl.h,v 1.193 2011/04/26 15:51:32 joerg Exp $ */
+/* $NetBSD: sysctl.h,v 1.194 2011/04/26 16:36:43 joerg Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -1003,14 +1003,12 @@
* Subsequent levels are specified in the emulations themselves.
*/
#define EMUL_LINUX 1
-#define EMUL_IRIX 2
#define EMUL_LINUX32 5
#define EMUL_MAXID 6
#define CTL_EMUL_NAMES { \
{ 0, 0 }, \
{ "linux", CTLTYPE_NODE }, \
- { "irix", CTLTYPE_NODE }, \
{ "linux32", CTLTYPE_NODE }, \
}
Index: src/usr.bin/kdump/setemul.c
diff -u src/usr.bin/kdump/setemul.c:1.27 src/usr.bin/kdump/setemul.c:1.28
--- src/usr.bin/kdump/setemul.c:1.27 Tue Apr 26 15:51:32 2011
+++ src/usr.bin/kdump/setemul.c Tue Apr 26 16:36:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: setemul.c,v 1.27 2011/04/26 15:51:32 joerg Exp $ */
+/* $NetBSD: setemul.c,v 1.28 2011/04/26 16:36:43 joerg Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: setemul.c,v 1.27 2011/04/26 15:51:32 joerg Exp $");
+__RCSID("$NetBSD: setemul.c,v 1.28 2011/04/26 16:36:43 joerg Exp $");
#endif /* not lint */
#include <sys/param.h>
@@ -84,7 +84,6 @@
#include "../../sys/compat/netbsd32/netbsd32_syscall.h"
#include "../../sys/compat/freebsd/freebsd_syscall.h"
#include "../../sys/compat/ibcs2/ibcs2_syscall.h"
-#include "../../sys/compat/irix/irix_syscall.h"
#include "../../sys/compat/linux/linux_syscall.h"
#include "../../sys/compat/linux32/linux32_syscall.h"
#include "../../sys/compat/osf1/osf1_syscall.h"
@@ -103,7 +102,6 @@
#include "../../sys/compat/netbsd32/netbsd32_syscalls.c"
#include "../../sys/compat/freebsd/freebsd_syscalls.c"
#include "../../sys/compat/ibcs2/ibcs2_syscalls.c"
-#include "../../sys/compat/irix/irix_syscalls.c"
#include "../../sys/compat/linux/linux_syscalls.c"
#include "../../sys/compat/linux32/linux32_syscalls.c"
#include "../../sys/compat/osf1/osf1_syscalls.c"
@@ -118,7 +116,6 @@
#include "../../sys/compat/svr4/svr4_errno.c"
#include "../../sys/compat/ibcs2/ibcs2_errno.c"
-#include "../../sys/compat/irix/irix_errno.c"
#include "../../sys/compat/osf1/osf1_errno.c"
#include "../../sys/compat/linux/common/linux_errno.c"
#undef KTRACE
@@ -126,7 +123,6 @@
#define SIGRTMIN 33 /* XXX */
#include "../../sys/compat/svr4/svr4_signo.c"
#include "../../sys/compat/ibcs2/ibcs2_signo.c"
-/* irix uses svr4 */
#include "../../sys/compat/osf1/osf1_signo.c"
#include "../../sys/compat/linux/common/linux_signo.c"
@@ -150,14 +146,6 @@
native_to_ibcs2_errno, NELEM(native_to_ibcs2_errno),
ibcs2_to_native_signo, NSIG, 0 },
- { "irix o32", irix_syscallnames, IRIX_SYS_MAXSYSCALL,
- native_to_irix_errno, NELEM(native_to_irix_errno),
- svr4_to_native_signo, NSIG, 0 },
-
- { "irix n32", irix_syscallnames, IRIX_SYS_MAXSYSCALL,
- native_to_irix_errno, NELEM(native_to_irix_errno),
- svr4_to_native_signo, NSIG, 0 },
-
{ "linux", linux_syscallnames, LINUX_SYS_MAXSYSCALL,
native_to_linux_errno, NELEM(native_to_linux_errno),
linux_to_native_signo, NSIG, 0 },
