Subject: [PATCH 2/3] general kernel

---
 sys/amd64/amd64/elf_machdep.c       |  1 -
 sys/amd64/amd64/trap.c              |  2 --
 sys/amd64/conf/NOTES                |  3 ---
 sys/amd64/ia32/ia32_syscall.c       |  2 --
 sys/amd64/linux/linux_sysvec.c      |  1 -
 sys/amd64/linux32/linux32_sysvec.c  |  1 -
 sys/arm/arm/elf_machdep.c           |  1 -
 sys/arm/arm/syscall.c               |  2 --
 sys/arm/arm/vm_machdep.c            |  2 --
 sys/arm64/arm64/elf_machdep.c       |  1 -
 sys/arm64/arm64/trap.c              |  2 --
 sys/arm64/linux/linux_sysvec.c      |  3 ---
 sys/compat/ia32/ia32_sysvec.c       |  1 -
 sys/conf/files.i386                 | 19 -------------------
 sys/conf/options.amd64              |  1 -
 sys/conf/options.i386               |  1 -
 sys/i386/Makefile                   |  8 ++++----
 sys/i386/conf/NOTES                 |  3 ---
 sys/i386/i386/elf_machdep.c         |  1 -
 sys/i386/i386/trap.c                |  2 --
 sys/i386/linux/linux_sysvec.c       |  2 --
 sys/kern/imgact_aout.c              |  2 --
 sys/kern/init_main.c                |  1 -
 sys/kern/makesyscalls.sh            |  8 ++++----
 sys/mips/mips/elf_machdep.c         |  2 --
 sys/mips/mips/freebsd32_machdep.c   |  1 -
 sys/mips/mips/trap.c                |  2 --
 sys/powerpc/powerpc/elf32_machdep.c |  1 -
 sys/powerpc/powerpc/elf64_machdep.c |  2 --
 sys/powerpc/powerpc/exec_machdep.c  |  2 --
 sys/powerpc/powerpc/trap.c          |  2 --
 sys/riscv/riscv/elf_machdep.c       |  1 -
 sys/riscv/riscv/trap.c              |  2 --
 sys/sparc64/sparc64/elf_machdep.c   |  1 -
 sys/sparc64/sparc64/trap.c          |  2 --
 sys/sys/sysent.h                    |  1 -
 36 files changed, 8 insertions(+), 81 deletions(-)

diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c
index 7c43f26c28b..f70d86ed1a9 100644
--- a/sys/amd64/amd64/elf_machdep.c
+++ b/sys/amd64/amd64/elf_machdep.c
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
 struct sysentvec elf64_freebsd_sysvec = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 72b9b3e78d9..8f7d5dac297 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -999,8 +999,6 @@ cpu_fetch_syscall_args(struct thread *td)
 		reg++;
 		regcnt--;
 	}
- 	if (p->p_sysent->sv_mask)
- 		sa->code &= p->p_sysent->sv_mask;
 
  	if (sa->code >= p->p_sysent->sv_size)
  		sa->callp = &p->p_sysent->sv_table[0];
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
index e11120fbdd5..56f73c73ff5 100644
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -626,9 +626,6 @@ options 	EFIRT
 # Enable 32-bit runtime support for FreeBSD/i386 binaries.
 options 	COMPAT_FREEBSD32
 
-# Enable iBCS2 runtime support for SCO and ISC binaries
-#XXX#options 	IBCS2
-
 # Emulate spx device for client side of SVR3 local X interface
 #XXX#options 	SPX_HACK
 
diff --git a/sys/amd64/ia32/ia32_syscall.c b/sys/amd64/ia32/ia32_syscall.c
index 989f5486213..43844602cf3 100644
--- a/sys/amd64/ia32/ia32_syscall.c
+++ b/sys/amd64/ia32/ia32_syscall.c
@@ -177,8 +177,6 @@ ia32_fetch_syscall_args(struct thread *td)
 		sa->code = tmp;
 		params += sizeof(quad_t);
 	}
- 	if (p->p_sysent->sv_mask)
- 		sa->code &= p->p_sysent->sv_mask;
  	if (sa->code >= p->p_sysent->sv_size)
  		sa->callp = &p->p_sysent->sv_table[0];
   	else
diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c
index afa06bb415c..271e86260ae 100644
--- a/sys/amd64/linux/linux_sysvec.c
+++ b/sys/amd64/linux/linux_sysvec.c
@@ -711,7 +711,6 @@ linux_vsyscall(struct thread *td)
 struct sysentvec elf_linux_sysvec = {
 	.sv_size	= LINUX_SYS_MAXSYSCALL,
 	.sv_table	= linux_sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= ELAST + 1,
 	.sv_errtbl	= linux_errtbl,
 	.sv_transtrap	= linux_translate_traps,
diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c
index 66d441e96c6..02a417a207f 100644
--- a/sys/amd64/linux32/linux32_sysvec.c
+++ b/sys/amd64/linux32/linux32_sysvec.c
@@ -907,7 +907,6 @@ linux32_fixlimit(struct rlimit *rl, int which)
 struct sysentvec elf_linux_sysvec = {
 	.sv_size	= LINUX32_SYS_MAXSYSCALL,
 	.sv_table	= linux32_sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= ELAST + 1,
 	.sv_errtbl	= linux_errtbl,
 	.sv_transtrap	= linux_translate_traps,
diff --git a/sys/arm/arm/elf_machdep.c b/sys/arm/arm/elf_machdep.c
index 3ab3eb90f12..acfa1e6649f 100644
--- a/sys/arm/arm/elf_machdep.c
+++ b/sys/arm/arm/elf_machdep.c
@@ -59,7 +59,6 @@ u_long elf_hwcap2;
 struct sysentvec elf32_freebsd_sysvec = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/arm/arm/syscall.c b/sys/arm/arm/syscall.c
index 8c33fff30a1..21a88e9c6c6 100644
--- a/sys/arm/arm/syscall.c
+++ b/sys/arm/arm/syscall.c
@@ -118,8 +118,6 @@ cpu_fetch_syscall_args(struct thread *td)
 		ap += 2;
 	}
 	p = td->td_proc;
-	if (p->p_sysent->sv_mask)
-		sa->code &= p->p_sysent->sv_mask;
 	if (sa->code >= p->p_sysent->sv_size)
 		sa->callp = &p->p_sysent->sv_table[0];
 	else
diff --git a/sys/arm/arm/vm_machdep.c b/sys/arm/arm/vm_machdep.c
index febb6de09be..31527619a61 100644
--- a/sys/arm/arm/vm_machdep.c
+++ b/sys/arm/arm/vm_machdep.c
@@ -190,8 +190,6 @@ cpu_set_syscall_retval(struct thread *td, int error)
 	if (call == SYS___syscall) {
 		register_t *ap = &frame->tf_r0;
 		register_t code = ap[_QUAD_LOWWORD];
-		if (td->td_proc->p_sysent->sv_mask)
-			code &= td->td_proc->p_sysent->sv_mask;
 		fixup = (code != SYS_lseek);
 	}
 #endif
diff --git a/sys/arm64/arm64/elf_machdep.c b/sys/arm64/arm64/elf_machdep.c
index 67244adfb0c..98e949decec 100644
--- a/sys/arm64/arm64/elf_machdep.c
+++ b/sys/arm64/arm64/elf_machdep.c
@@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$");
 static struct sysentvec elf64_freebsd_sysvec = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c
index 9de15479800..5cc85435ce2 100644
--- a/sys/arm64/arm64/trap.c
+++ b/sys/arm64/arm64/trap.c
@@ -115,8 +115,6 @@ cpu_fetch_syscall_args(struct thread *td)
 		nap--;
 	}
 
-	if (p->p_sysent->sv_mask)
-		sa->code &= p->p_sysent->sv_mask;
 	if (sa->code >= p->p_sysent->sv_size)
 		sa->callp = &p->p_sysent->sv_table[0];
 	else
diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c
index 0cbfd322de9..8b197cc59d3 100644
--- a/sys/arm64/linux/linux_sysvec.c
+++ b/sys/arm64/linux/linux_sysvec.c
@@ -124,8 +124,6 @@ linux_fetch_syscall_args(struct thread *td)
 
 	sa->code = td->td_frame->tf_x[8];
 	/* LINUXTODO: generic syscall? */
-	if (p->p_sysent->sv_mask)
-		sa->code &= p->p_sysent->sv_mask;
 	if (sa->code >= p->p_sysent->sv_size)
 		sa->callp = &p->p_sysent->sv_table[0];
 	else
@@ -364,7 +362,6 @@ linux_vsyscall(struct thread *td)
 struct sysentvec elf_linux_sysvec = {
 	.sv_size	= LINUX_SYS_MAXSYSCALL,
 	.sv_table	= linux_sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= ELAST + 1,
 	.sv_errtbl	= linux_errtbl,
 	.sv_transtrap	= linux_translate_traps,
diff --git a/sys/compat/ia32/ia32_sysvec.c b/sys/compat/ia32/ia32_sysvec.c
index 91a2acf329f..60652514641 100644
--- a/sys/compat/ia32/ia32_sysvec.c
+++ b/sys/compat/ia32/ia32_sysvec.c
@@ -98,7 +98,6 @@ SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RWTUN, &ia32_maxvmem, 0, "
 struct sysentvec ia32_freebsd_sysvec = {
 	.sv_size	= FREEBSD32_SYS_MAXSYSCALL,
 	.sv_table	= freebsd32_sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index d2591137a99..0cf27b25546 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -511,25 +511,6 @@ i386/i386/trap.c		standard
 i386/i386/uio_machdep.c		standard
 i386/i386/vm86.c		standard
 i386/i386/vm_machdep.c		standard
-i386/ibcs2/ibcs2_errno.c	optional ibcs2
-i386/ibcs2/ibcs2_fcntl.c	optional ibcs2
-i386/ibcs2/ibcs2_ioctl.c	optional ibcs2
-i386/ibcs2/ibcs2_ipc.c		optional ibcs2
-i386/ibcs2/ibcs2_isc.c		optional ibcs2
-i386/ibcs2/ibcs2_isc_sysent.c	optional ibcs2
-i386/ibcs2/ibcs2_misc.c		optional ibcs2
-i386/ibcs2/ibcs2_msg.c		optional ibcs2
-i386/ibcs2/ibcs2_other.c	optional ibcs2
-i386/ibcs2/ibcs2_signal.c	optional ibcs2
-i386/ibcs2/ibcs2_socksys.c	optional ibcs2
-i386/ibcs2/ibcs2_stat.c		optional ibcs2
-i386/ibcs2/ibcs2_sysent.c	optional ibcs2
-i386/ibcs2/ibcs2_sysi86.c	optional ibcs2
-i386/ibcs2/ibcs2_sysvec.c	optional ibcs2
-i386/ibcs2/ibcs2_util.c		optional ibcs2
-i386/ibcs2/ibcs2_xenix.c	optional ibcs2
-i386/ibcs2/ibcs2_xenix_sysent.c	optional ibcs2
-i386/ibcs2/imgact_coff.c	optional ibcs2
 i386/linux/imgact_linux.c	optional compat_linux
 i386/linux/linux_copyout.c	optional compat_linux
 i386/linux/linux_dummy.c	optional compat_linux
diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64
index 1edb70164a8..8939ddaf624 100644
--- a/sys/conf/options.amd64
+++ b/sys/conf/options.amd64
@@ -16,7 +16,6 @@ PV_STATS		opt_pmap.h
 # (see src/sys/conf/options), except for broken debugging options.
 COMPAT_AOUT		opt_dontuse.h
 COMPAT_FREEBSD32	opt_global.h
-#IBCS2			opt_dontuse.h
 #COMPAT_LINUX		opt_dontuse.h
 COMPAT_LINUX32		opt_compat.h
 LINPROCFS		opt_dontuse.h
diff --git a/sys/conf/options.i386 b/sys/conf/options.i386
index 83298bad651..8c96ff40c55 100644
--- a/sys/conf/options.i386
+++ b/sys/conf/options.i386
@@ -22,7 +22,6 @@ PV_STATS		opt_pmap.h
 # they are handled like options for static filesystems
 # (see src/sys/conf/options), except for broken debugging options.
 COMPAT_AOUT		opt_dontuse.h
-IBCS2			opt_dontuse.h
 COMPAT_LINUX		opt_dontuse.h
 LINPROCFS		opt_dontuse.h
 LINSYSFS		opt_dontuse.h
diff --git a/sys/i386/Makefile b/sys/i386/Makefile
index f6ecf7fa2fd..fe6ac2bf41d 100644
--- a/sys/i386/Makefile
+++ b/sys/i386/Makefile
@@ -14,7 +14,7 @@ all:
 	@echo "make links or tags only"
 
 # Directories in which to place i386 tags links
-DI386=	apm i386 ibcs2 include isa linux
+DI386=	apm i386 include isa linux
 
 links::
 	-for i in ${COMMDIR1}; do \
@@ -25,9 +25,9 @@ links::
 	    (cd $$i && { rm -f tags; ln -s ../tags tags; }) done
 
 SI386=	${SYS}/i386/acpica/*.[ch] ${SYS}/i386/bios/*.[ch] \
-	${SYS}/i386/i386/*.[ch] ${SYS}/i386/ibcs2/*.[ch] \
-	${SYS}/i386/include/*.[ch] ${SYS}/i386/isa/*.[ch] \
-	${SYS}/i386/linux/*.[ch] ${SYS}/i386/pci/*.[ch]
+	${SYS}/i386/i386/*.[ch] ${SYS}/i386/include/*.[ch] \
+	${SYS}/i386/isa/*.[ch] ${SYS}/i386/linux/*.[ch] \
+	${SYS}/i386/pci/*.[ch]
 AI386=	${SYS}/i386/i386/*.s
 
 tags::
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 3adeb338da7..29a3ab1ee3f 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -907,9 +907,6 @@ options 	NKPT=31
 #####################################################################
 # ABI Emulation
 
-# Enable iBCS2 runtime support for SCO and ISC binaries
-#options 	IBCS2
-
 # Emulate spx device for client side of SVR3 local X interface
 options 	SPX_HACK
 
diff --git a/sys/i386/i386/elf_machdep.c b/sys/i386/i386/elf_machdep.c
index bd07bbc1cc8..59c192f5923 100644
--- a/sys/i386/i386/elf_machdep.c
+++ b/sys/i386/i386/elf_machdep.c
@@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$");
 struct sysentvec elf32_freebsd_sysvec = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c
index 19086221b11..6fcf05d0b5b 100644
--- a/sys/i386/i386/trap.c
+++ b/sys/i386/i386/trap.c
@@ -1101,8 +1101,6 @@ cpu_fetch_syscall_args(struct thread *td)
 		params += sizeof(quad_t);
 	}
 
- 	if (p->p_sysent->sv_mask)
- 		sa->code &= p->p_sysent->sv_mask;
  	if (sa->code >= p->p_sysent->sv_size)
  		sa->callp = &p->p_sysent->sv_table[0];
   	else
diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c
index d379a6e8f84..f3c4dd15873 100644
--- a/sys/i386/linux/linux_sysvec.c
+++ b/sys/i386/linux/linux_sysvec.c
@@ -850,7 +850,6 @@ linux_get_machine(const char **dst)
 struct sysentvec linux_sysvec = {
 	.sv_size	= LINUX_SYS_MAXSYSCALL,
 	.sv_table	= linux_sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= ELAST + 1,
 	.sv_errtbl	= linux_errtbl,
 	.sv_transtrap	= linux_translate_traps,
@@ -887,7 +886,6 @@ INIT_SYSENTVEC(aout_sysvec, &linux_sysvec);
 struct sysentvec elf_linux_sysvec = {
 	.sv_size	= LINUX_SYS_MAXSYSCALL,
 	.sv_table	= linux_sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= ELAST + 1,
 	.sv_errtbl	= linux_errtbl,
 	.sv_transtrap	= linux_translate_traps,
diff --git a/sys/kern/imgact_aout.c b/sys/kern/imgact_aout.c
index fe893241a4e..35993f4d4cc 100644
--- a/sys/kern/imgact_aout.c
+++ b/sys/kern/imgact_aout.c
@@ -76,7 +76,6 @@ static int	aout_fixup(register_t **stack_base, struct image_params *imgp);
 struct sysentvec aout_sysvec = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
@@ -119,7 +118,6 @@ extern u_long ia32_maxssiz;
 struct sysentvec aout_sysvec = {
 	.sv_size	= FREEBSD32_SYS_MAXSYSCALL,
 	.sv_table	= freebsd32_sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 79a625b7900..5724dd91ca1 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -399,7 +399,6 @@ null_set_syscall_retval(struct thread *td __unused, int error __unused)
 struct sysentvec null_sysvec = {
 	.sv_size	= 0,
 	.sv_table	= NULL,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/kern/makesyscalls.sh b/sys/kern/makesyscalls.sh
index 26b06df4e64..12baa15b96d 100644
--- a/sys/kern/makesyscalls.sh
+++ b/sys/kern/makesyscalls.sh
@@ -494,8 +494,8 @@ sed -e '
 		if (!flag("NOPROTO") && !flag("NODEF")) {
 			if (funcname == "nosys" || funcname == "lkmnosys" ||
 			    funcname == "sysarch" || funcname ~ /^freebsd/ || 
-			    funcname ~ /^linux/ || funcname ~ /^ibcs2/ ||
-			    funcname ~ /^xenix/ || funcname ~ /^cloudabi/) {
+			    funcname ~ /^linux/ || funcname ~ /^xenix/ ||
+			    funcname ~ /^cloudabi/) {
 				printf("%s\t%s(struct thread *, struct %s *)",
 				    rettype, funcname, argalias) > sysdcl
 			} else {
@@ -514,8 +514,8 @@ sed -e '
 		} else {
 			if (funcname == "nosys" || funcname == "sysarch" || 
 			    funcname == "lkmnosys" || funcname ~ /^freebsd/ ||
-			    funcname ~ /^linux/ || funcname ~ /^ibcs2/ ||
-			    funcname ~ /^xenix/ || funcname ~ /^cloudabi/) {
+			    funcname ~ /^linux/ || funcname ~ /^xenix/ ||
+			    funcname ~ /^cloudabi/) {
 				printf("%s, %s, NULL, 0, 0, %s, %s },", funcname, auditev, flags, thr_flag) > sysent
 				column = column + length(funcname) + length(auditev) + length(flags) + 3 
 			} else {
diff --git a/sys/mips/mips/elf_machdep.c b/sys/mips/mips/elf_machdep.c
index d5e92afa0d6..e8791f821a6 100644
--- a/sys/mips/mips/elf_machdep.c
+++ b/sys/mips/mips/elf_machdep.c
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
 struct sysentvec elf64_freebsd_sysvec = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
@@ -111,7 +110,6 @@ elf64_dump_thread(struct thread *td __unused, void *dst __unused,
 struct sysentvec elf32_freebsd_sysvec = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/mips/mips/freebsd32_machdep.c b/sys/mips/mips/freebsd32_machdep.c
index 73c5848029f..df79bfed3ef 100644
--- a/sys/mips/mips/freebsd32_machdep.c
+++ b/sys/mips/mips/freebsd32_machdep.c
@@ -77,7 +77,6 @@ extern const char *freebsd32_syscallnames[];
 struct sysentvec elf32_freebsd_sysvec = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= freebsd32_sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/mips/mips/trap.c b/sys/mips/mips/trap.c
index 746208e521f..d89419cd4c5 100644
--- a/sys/mips/mips/trap.c
+++ b/sys/mips/mips/trap.c
@@ -442,8 +442,6 @@ cpu_fetch_syscall_args(struct thread *td)
 	 * XXX
 	 * Shouldn't this go before switching on the code?
 	 */
-	if (se->sv_mask)
-		sa->code &= se->sv_mask;
 
 	if (sa->code >= se->sv_size)
 		sa->callp = &se->sv_table[0];
diff --git a/sys/powerpc/powerpc/elf32_machdep.c b/sys/powerpc/powerpc/elf32_machdep.c
index 1a0d096d7f9..18ae37318fd 100644
--- a/sys/powerpc/powerpc/elf32_machdep.c
+++ b/sys/powerpc/powerpc/elf32_machdep.c
@@ -83,7 +83,6 @@ struct sysentvec elf32_freebsd_sysvec = {
 #else
 	.sv_table	= sysent,
 #endif
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/powerpc/powerpc/elf64_machdep.c b/sys/powerpc/powerpc/elf64_machdep.c
index 74a13064bd4..e6892c82daa 100644
--- a/sys/powerpc/powerpc/elf64_machdep.c
+++ b/sys/powerpc/powerpc/elf64_machdep.c
@@ -58,7 +58,6 @@ static void exec_setregs_funcdesc(struct thread *td, struct image_params *imgp,
 struct sysentvec elf64_freebsd_sysvec_v1 = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
@@ -97,7 +96,6 @@ INIT_SYSENTVEC(elf64_sysvec_v1, &elf64_freebsd_sysvec_v1);
 struct sysentvec elf64_freebsd_sysvec_v2 = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/powerpc/powerpc/exec_machdep.c b/sys/powerpc/powerpc/exec_machdep.c
index 4105395ed6f..e7488d0df7f 100644
--- a/sys/powerpc/powerpc/exec_machdep.c
+++ b/sys/powerpc/powerpc/exec_machdep.c
@@ -859,8 +859,6 @@ cpu_set_syscall_retval(struct thread *td, int error)
 	if (tf->fixreg[0] == SYS___syscall &&
 	    (SV_PROC_FLAG(p, SV_ILP32))) {
 		int code = tf->fixreg[FIRSTARG + 1];
-		if (p->p_sysent->sv_mask)
-			code &= p->p_sysent->sv_mask;
 		fixup = (
 #if defined(COMPAT_FREEBSD6) && defined(SYS_freebsd6_lseek)
 		    code != SYS_freebsd6_lseek &&
diff --git a/sys/powerpc/powerpc/trap.c b/sys/powerpc/powerpc/trap.c
index cdb644f7a75..073ab561b18 100644
--- a/sys/powerpc/powerpc/trap.c
+++ b/sys/powerpc/powerpc/trap.c
@@ -609,8 +609,6 @@ cpu_fetch_syscall_args(struct thread *td)
 		}
 	}
 
- 	if (p->p_sysent->sv_mask)
-		sa->code &= p->p_sysent->sv_mask;
 	if (sa->code >= p->p_sysent->sv_size)
 		sa->callp = &p->p_sysent->sv_table[0];
 	else
diff --git a/sys/riscv/riscv/elf_machdep.c b/sys/riscv/riscv/elf_machdep.c
index f3f589b6f14..e9ca4ca0228 100644
--- a/sys/riscv/riscv/elf_machdep.c
+++ b/sys/riscv/riscv/elf_machdep.c
@@ -61,7 +61,6 @@ __FBSDID("$FreeBSD$");
 struct sysentvec elf64_freebsd_sysvec = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c
index 57f5c558d28..bbd1391bbc5 100644
--- a/sys/riscv/riscv/trap.c
+++ b/sys/riscv/riscv/trap.c
@@ -111,8 +111,6 @@ cpu_fetch_syscall_args(struct thread *td)
 		nap--;
 	}
 
-	if (p->p_sysent->sv_mask)
-		sa->code &= p->p_sysent->sv_mask;
 	if (sa->code >= p->p_sysent->sv_size)
 		sa->callp = &p->p_sysent->sv_table[0];
 	else
diff --git a/sys/sparc64/sparc64/elf_machdep.c b/sys/sparc64/sparc64/elf_machdep.c
index 0eaeff8f810..1fbd09fa945 100644
--- a/sys/sparc64/sparc64/elf_machdep.c
+++ b/sys/sparc64/sparc64/elf_machdep.c
@@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$");
 static struct sysentvec elf64_freebsd_sysvec = {
 	.sv_size	= SYS_MAXSYSCALL,
 	.sv_table	= sysent,
-	.sv_mask	= 0,
 	.sv_errsize	= 0,
 	.sv_errtbl	= NULL,
 	.sv_transtrap	= NULL,
diff --git a/sys/sparc64/sparc64/trap.c b/sys/sparc64/sparc64/trap.c
index 39ff59e9310..81c48b7699f 100644
--- a/sys/sparc64/sparc64/trap.c
+++ b/sys/sparc64/sparc64/trap.c
@@ -558,8 +558,6 @@ cpu_fetch_syscall_args(struct thread *td)
 		regcnt--;
 	}
 
-	if (p->p_sysent->sv_mask)
-		sa->code &= p->p_sysent->sv_mask;
 	if (sa->code >= p->p_sysent->sv_size)
 		sa->callp = &p->p_sysent->sv_table[0];
 	else
diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h
index 3938a8ab0e9..434b69b2f4e 100644
--- a/sys/sys/sysent.h
+++ b/sys/sys/sysent.h
@@ -95,7 +95,6 @@ struct vnode;
 struct sysentvec {
 	int		sv_size;	/* number of entries */
 	struct sysent	*sv_table;	/* pointer to sysent */
-	u_int		sv_mask;	/* optional mask to index */
 	int		sv_errsize;	/* size of errno translation table */
 	const int 	*sv_errtbl;	/* errno translation table */
 	int		(*sv_transtrap)(int, int);
-- 
2.19.0