remove systrace remnants

3 files changed, 7 insertions, 12 deletions

diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c
index 1af3e946c60..a9ede923806 100644
--- a/sys/kern/kern_descrip.c
+++ b/sys/kern/kern_descrip.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_descrip.c,v 1.129 2016/03/19 12:04:15 natano Exp $	*/
+/*	$OpenBSD: kern_descrip.c,v 1.130 2016/04/25 20:18:31 tedu Exp $	*/
 /*	$NetBSD: kern_descrip.c,v 1.42 1996/03/30 22:24:38 christos Exp $	*/
 
 /*
@@ -1036,13 +1036,12 @@ fdcopy(struct process *pr)
 			 * XXX Gruesome hack. If count gets too high, fail
 			 * to copy an fd, since fdcopy()'s callers do not
 			 * permit it to indicate failure yet.
-			 * Meanwhile, kqueue and systrace files have to be
+			 * Meanwhile, kqueue files have to be
 			 * tied to the process that opened them to enforce
 			 * their internal consistency, so close them here.
 			 */
 			if ((*fpp)->f_count == LONG_MAX-2 ||
-			    (*fpp)->f_type == DTYPE_KQUEUE ||
-			    (*fpp)->f_type == DTYPE_SYSTRACE)
+			    (*fpp)->f_type == DTYPE_KQUEUE)
 				fdremove(newfdp, i);
 			else
 				(*fpp)->f_count++;
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 16768d4e06b..a19ebae1bb1 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_fork.c,v 1.186 2016/04/25 20:00:33 tedu Exp $	*/
+/*	$OpenBSD: kern_fork.c,v 1.187 2016/04/25 20:18:31 tedu Exp $	*/
 /*	$NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $	*/
 
 /*
@@ -261,9 +261,6 @@ fork1(struct proc *curp, int flags, void *stack, pid_t *tidptr,
 	vaddr_t uaddr;
 	int s;
 	struct  ptrace_state *newptstat = NULL;
-#if NSYSTRACE > 0
-	void *newstrp = NULL;
-#endif
 
 	/* sanity check some flag combinations */
 	if (flags & FORK_THREAD) {
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
index 1f06ea0ca4e..3a5b7eadf4e 100644
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uipc_usrreq.c,v 1.96 2016/03/19 12:04:15 natano Exp $	*/
+/*	$OpenBSD: uipc_usrreq.c,v 1.97 2016/04/25 20:18:31 tedu Exp $	*/
 /*	$NetBSD: uipc_usrreq.c,v 1.18 1996/02/09 19:00:50 christos Exp $	*/
 
 /*
@@ -852,9 +852,8 @@ morespace:
 		if (error)
 			goto fail;
 		    
-		/* kq and systrace descriptors cannot be copied */
-		if (fp->f_type == DTYPE_KQUEUE ||
-		    fp->f_type == DTYPE_SYSTRACE) {
+		/* kqueue descriptors cannot be copied */
+		if (fp->f_type == DTYPE_KQUEUE) {
 			error = EINVAL;
 			goto fail;
 		}