Module Name: src
Committed By: maya
Date: Tue Jan 9 20:55:43 UTC 2018
Modified Files:
src/sys/compat/aoutm68k: aoutm68k_exec.c
src/sys/compat/freebsd: freebsd_exec.c
src/sys/compat/ibcs2: ibcs2_exec.c
src/sys/compat/linux/common: linux_exec.c
src/sys/compat/linux32/common: linux32_exec.c
src/sys/compat/netbsd32: netbsd32_netbsd.c
src/sys/compat/osf1: osf1_exec.c
src/sys/compat/sunos: sunos_exec.c
src/sys/compat/sunos32: sunos32_exec.c
src/sys/compat/svr4: svr4_exec.c
src/sys/compat/svr4_32: svr4_32_exec.c
src/sys/compat/ultrix: ultrix_misc.c
src/sys/kern: kern_exec.c
src/sys/sys: proc.h
Log Message:
remove struct emul's e_fault.
It used to be used by COMPAT_IRIX for the purpose of overriding
uvm_fault (only implemented in MIPS), now removed.
Ride 8.99.12 version bump.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/aoutm68k/aoutm68k_exec.c
cvs rdiff -u -r1.39 -r1.40 src/sys/compat/freebsd/freebsd_exec.c
cvs rdiff -u -r1.76 -r1.77 src/sys/compat/ibcs2/ibcs2_exec.c
cvs rdiff -u -r1.117 -r1.118 src/sys/compat/linux/common/linux_exec.c
cvs rdiff -u -r1.21 -r1.22 src/sys/compat/linux32/common/linux32_exec.c
cvs rdiff -u -r1.213 -r1.214 src/sys/compat/netbsd32/netbsd32_netbsd.c
cvs rdiff -u -r1.44 -r1.45 src/sys/compat/osf1/osf1_exec.c
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/sunos/sunos_exec.c
cvs rdiff -u -r1.33 -r1.34 src/sys/compat/sunos32/sunos32_exec.c
cvs rdiff -u -r1.66 -r1.67 src/sys/compat/svr4/svr4_exec.c
cvs rdiff -u -r1.27 -r1.28 src/sys/compat/svr4_32/svr4_32_exec.c
cvs rdiff -u -r1.122 -r1.123 src/sys/compat/ultrix/ultrix_misc.c
cvs rdiff -u -r1.454 -r1.455 src/sys/kern/kern_exec.c
cvs rdiff -u -r1.343 -r1.344 src/sys/sys/proc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/aoutm68k/aoutm68k_exec.c
diff -u src/sys/compat/aoutm68k/aoutm68k_exec.c:1.27 src/sys/compat/aoutm68k/aoutm68k_exec.c:1.28
--- src/sys/compat/aoutm68k/aoutm68k_exec.c:1.27 Sun Feb 19 21:06:36 2012
+++ src/sys/compat/aoutm68k/aoutm68k_exec.c Tue Jan 9 20:55:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: aoutm68k_exec.c,v 1.27 2012/02/19 21:06:36 rmind Exp $ */
+/* $NetBSD: aoutm68k_exec.c,v 1.28 2018/01/09 20:55:42 maya Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aoutm68k_exec.c,v 1.27 2012/02/19 21:06:36 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aoutm68k_exec.c,v 1.28 2018/01/09 20:55:42 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -81,7 +81,6 @@ struct emul emul_netbsd_aoutm68k = {
.e_lwp_exit = NULL,
.e_syscall_intern = aoutm68k_syscall_intern,
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = uvm_default_mapaddr,
.e_usertrap = NULL,
.e_ucsize = 0,
Index: src/sys/compat/freebsd/freebsd_exec.c
diff -u src/sys/compat/freebsd/freebsd_exec.c:1.39 src/sys/compat/freebsd/freebsd_exec.c:1.40
--- src/sys/compat/freebsd/freebsd_exec.c:1.39 Tue Aug 8 08:04:06 2017
+++ src/sys/compat/freebsd/freebsd_exec.c Tue Jan 9 20:55:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: freebsd_exec.c,v 1.39 2017/08/08 08:04:06 maxv Exp $ */
+/* $NetBSD: freebsd_exec.c,v 1.40 2018/01/09 20:55:42 maya Exp $ */
/*
* Copyright (c) 1993, 1994 Christopher G. Demetriou
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_exec.c,v 1.39 2017/08/08 08:04:06 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_exec.c,v 1.40 2018/01/09 20:55:42 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -95,7 +95,6 @@ struct emul emul_freebsd = {
.e_syscall_intern = syscall,
#endif
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = uvm_default_mapaddr,
.e_usertrap = NULL,
.e_ucsize = 0,
Index: src/sys/compat/ibcs2/ibcs2_exec.c
diff -u src/sys/compat/ibcs2/ibcs2_exec.c:1.76 src/sys/compat/ibcs2/ibcs2_exec.c:1.77
--- src/sys/compat/ibcs2/ibcs2_exec.c:1.76 Sun Feb 19 21:06:37 2012
+++ src/sys/compat/ibcs2/ibcs2_exec.c Tue Jan 9 20:55:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ibcs2_exec.c,v 1.76 2012/02/19 21:06:37 rmind Exp $ */
+/* $NetBSD: ibcs2_exec.c,v 1.77 2018/01/09 20:55:42 maya Exp $ */
/*
* Copyright (c) 1994, 1995, 1998 Scott Bartram
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec.c,v 1.76 2012/02/19 21:06:37 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ibcs2_exec.c,v 1.77 2018/01/09 20:55:42 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -109,7 +109,6 @@ struct emul emul_ibcs2 = {
.e_syscall_intern = syscall,
#endif
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = uvm_default_mapaddr,
.e_usertrap = NULL,
.e_ucsize = 0,
Index: src/sys/compat/linux/common/linux_exec.c
diff -u src/sys/compat/linux/common/linux_exec.c:1.117 src/sys/compat/linux/common/linux_exec.c:1.118
--- src/sys/compat/linux/common/linux_exec.c:1.117 Sun Nov 9 17:48:08 2014
+++ src/sys/compat/linux/common/linux_exec.c Tue Jan 9 20:55:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_exec.c,v 1.117 2014/11/09 17:48:08 maxv Exp $ */
+/* $NetBSD: linux_exec.c,v 1.118 2018/01/09 20:55:42 maya Exp $ */
/*-
* Copyright (c) 1994, 1995, 1998, 2000, 2007, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.117 2014/11/09 17:48:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_exec.c,v 1.118 2018/01/09 20:55:42 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -108,7 +108,6 @@ struct emul emul_linux = {
#error Implement __HAVE_SYSCALL_INTERN for this platform
#endif
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = uvm_default_mapaddr,
.e_usertrap = linux_usertrap,
.e_ucsize = 0,
Index: src/sys/compat/linux32/common/linux32_exec.c
diff -u src/sys/compat/linux32/common/linux32_exec.c:1.21 src/sys/compat/linux32/common/linux32_exec.c:1.22
--- src/sys/compat/linux32/common/linux32_exec.c:1.21 Sun Feb 19 21:06:38 2012
+++ src/sys/compat/linux32/common/linux32_exec.c Tue Jan 9 20:55:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux32_exec.c,v 1.21 2012/02/19 21:06:38 rmind Exp $ */
+/* $NetBSD: linux32_exec.c,v 1.22 2018/01/09 20:55:42 maya Exp $ */
/*-
* Copyright (c) 1994-2007 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux32_exec.c,v 1.21 2012/02/19 21:06:38 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux32_exec.c,v 1.22 2018/01/09 20:55:42 maya Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -89,7 +89,6 @@ struct emul emul_linux32 = {
.e_lwp_exit = linux_e_lwp_exit,
.e_syscall_intern = linux32_syscall_intern,
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = netbsd32_vm_default_addr,
.e_usertrap = NULL,
.e_ucsize = 0,
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.213 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.214
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.213 Sat Jan 6 16:41:23 2018
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Tue Jan 9 20:55:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.213 2018/01/06 16:41:23 kamil Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.214 2018/01/09 20:55:43 maya Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.213 2018/01/06 16:41:23 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.214 2018/01/09 20:55:43 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -154,7 +154,6 @@ struct emul emul_netbsd32 = {
.e_syscall = syscall,
#endif
.e_sysctlovly = &netbsd32_sysctl_root,
- .e_fault = NULL,
.e_vm_default_addr = netbsd32_vm_default_addr,
.e_usertrap = NULL,
.e_ucsize = sizeof(ucontext32_t),
Index: src/sys/compat/osf1/osf1_exec.c
diff -u src/sys/compat/osf1/osf1_exec.c:1.44 src/sys/compat/osf1/osf1_exec.c:1.45
--- src/sys/compat/osf1/osf1_exec.c:1.44 Sun Feb 19 21:06:43 2012
+++ src/sys/compat/osf1/osf1_exec.c Tue Jan 9 20:55:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_exec.c,v 1.44 2012/02/19 21:06:43 rmind Exp $ */
+/* $NetBSD: osf1_exec.c,v 1.45 2018/01/09 20:55:43 maya Exp $ */
/*
* Copyright (c) 1999 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_exec.c,v 1.44 2012/02/19 21:06:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_exec.c,v 1.45 2018/01/09 20:55:43 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -93,7 +93,6 @@ struct emul emul_osf1 = {
.e_syscall_intern = syscall,
#endif
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = uvm_default_mapaddr,
.e_usertrap = NULL,
.e_ucsize = 0,
Index: src/sys/compat/sunos/sunos_exec.c
diff -u src/sys/compat/sunos/sunos_exec.c:1.54 src/sys/compat/sunos/sunos_exec.c:1.55
--- src/sys/compat/sunos/sunos_exec.c:1.54 Sun Feb 19 21:06:44 2012
+++ src/sys/compat/sunos/sunos_exec.c Tue Jan 9 20:55:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_exec.c,v 1.54 2012/02/19 21:06:44 rmind Exp $ */
+/* $NetBSD: sunos_exec.c,v 1.55 2018/01/09 20:55:43 maya Exp $ */
/*
* Copyright (c) 1993 Theo de Raadt
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_exec.c,v 1.54 2012/02/19 21:06:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_exec.c,v 1.55 2018/01/09 20:55:43 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -95,7 +95,6 @@ struct emul emul_sunos = {
.e_syscall_intern = syscall,
#endif
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = uvm_default_mapaddr,
.e_usertrap = NULL,
.e_ucsize = 0,
Index: src/sys/compat/sunos32/sunos32_exec.c
diff -u src/sys/compat/sunos32/sunos32_exec.c:1.33 src/sys/compat/sunos32/sunos32_exec.c:1.34
--- src/sys/compat/sunos32/sunos32_exec.c:1.33 Sun Feb 19 21:06:44 2012
+++ src/sys/compat/sunos32/sunos32_exec.c Tue Jan 9 20:55:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos32_exec.c,v 1.33 2012/02/19 21:06:44 rmind Exp $ */
+/* $NetBSD: sunos32_exec.c,v 1.34 2018/01/09 20:55:43 maya Exp $ */
/*
* Copyright (c) 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos32_exec.c,v 1.33 2012/02/19 21:06:44 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos32_exec.c,v 1.34 2018/01/09 20:55:43 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -94,7 +94,6 @@ struct emul emul_sunos = {
.e_syscall_intern = syscall,
#endif
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = uvm_default_mapaddr,
.e_usertrap = NULL,
.e_ucsize = 0,
Index: src/sys/compat/svr4/svr4_exec.c
diff -u src/sys/compat/svr4/svr4_exec.c:1.66 src/sys/compat/svr4/svr4_exec.c:1.67
--- src/sys/compat/svr4/svr4_exec.c:1.66 Sun Feb 19 21:06:45 2012
+++ src/sys/compat/svr4/svr4_exec.c Tue Jan 9 20:55:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_exec.c,v 1.66 2012/02/19 21:06:45 rmind Exp $ */
+/* $NetBSD: svr4_exec.c,v 1.67 2018/01/09 20:55:43 maya Exp $ */
/*-
* Copyright (c) 1994, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_exec.c,v 1.66 2012/02/19 21:06:45 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_exec.c,v 1.67 2018/01/09 20:55:43 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -93,7 +93,6 @@ struct emul emul_svr4 = {
.e_syscall_intern = syscall,
#endif
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = uvm_default_mapaddr,
.e_usertrap = NULL,
.e_ucsize = 0,
Index: src/sys/compat/svr4_32/svr4_32_exec.c
diff -u src/sys/compat/svr4_32/svr4_32_exec.c:1.27 src/sys/compat/svr4_32/svr4_32_exec.c:1.28
--- src/sys/compat/svr4_32/svr4_32_exec.c:1.27 Sun Feb 19 21:06:45 2012
+++ src/sys/compat/svr4_32/svr4_32_exec.c Tue Jan 9 20:55:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_32_exec.c,v 1.27 2012/02/19 21:06:45 rmind Exp $ */
+/* $NetBSD: svr4_32_exec.c,v 1.28 2018/01/09 20:55:43 maya Exp $ */
/*-
* Copyright (c) 1994, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_32_exec.c,v 1.27 2012/02/19 21:06:45 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_32_exec.c,v 1.28 2018/01/09 20:55:43 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_syscall_debug.h"
@@ -96,7 +96,6 @@ struct emul emul_svr4_32 = {
.e_syscall_intern = syscall,
#endif
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = svr4_32_vm_default_addr,
.e_usertrap = NULL,
.e_ucsize = 0,
Index: src/sys/compat/ultrix/ultrix_misc.c
diff -u src/sys/compat/ultrix/ultrix_misc.c:1.122 src/sys/compat/ultrix/ultrix_misc.c:1.123
--- src/sys/compat/ultrix/ultrix_misc.c:1.122 Sun Feb 19 21:06:45 2012
+++ src/sys/compat/ultrix/ultrix_misc.c Tue Jan 9 20:55:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ultrix_misc.c,v 1.122 2012/02/19 21:06:45 rmind Exp $ */
+/* $NetBSD: ultrix_misc.c,v 1.123 2018/01/09 20:55:43 maya 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.122 2012/02/19 21:06:45 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ultrix_misc.c,v 1.123 2018/01/09 20:55:43 maya Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sysv.h"
@@ -195,7 +195,6 @@ struct emul emul_ultrix = {
.e_syscall_intern = syscall,
#endif
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = uvm_default_mapaddr,
.e_usertrap = NULL,
.e_ucsize = 0,
Index: src/sys/kern/kern_exec.c
diff -u src/sys/kern/kern_exec.c:1.454 src/sys/kern/kern_exec.c:1.455
--- src/sys/kern/kern_exec.c:1.454 Fri Jan 5 01:51:36 2018
+++ src/sys/kern/kern_exec.c Tue Jan 9 20:55:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_exec.c,v 1.454 2018/01/05 01:51:36 christos Exp $ */
+/* $NetBSD: kern_exec.c,v 1.455 2018/01/09 20:55:43 maya 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.454 2018/01/05 01:51:36 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.455 2018/01/09 20:55:43 maya Exp $");
#include "opt_exec.h"
#include "opt_execfmt.h"
@@ -232,7 +232,6 @@ struct emul emul_netbsd = {
.e_syscall = syscall,
#endif
.e_sysctlovly = NULL,
- .e_fault = NULL,
.e_vm_default_addr = uvm_default_mapaddr,
.e_usertrap = NULL,
.e_ucsize = sizeof(ucontext_t),
Index: src/sys/sys/proc.h
diff -u src/sys/sys/proc.h:1.343 src/sys/sys/proc.h:1.344
--- src/sys/sys/proc.h:1.343 Tue Nov 7 19:44:05 2017
+++ src/sys/sys/proc.h Tue Jan 9 20:55:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.343 2017/11/07 19:44:05 christos Exp $ */
+/* $NetBSD: proc.h,v 1.344 2018/01/09 20:55:43 maya Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -178,7 +178,6 @@ struct emul {
#endif
/* Emulation specific sysctl data */
struct sysctlnode *e_sysctlovly;
- int (*e_fault)(struct proc *, vaddr_t, int);
vaddr_t (*e_vm_default_addr)(struct proc *, vaddr_t, vsize_t,
int);
