From 9e8fb683484ba28aba9e4198ebc0804efa21bed9 Mon Sep 17 00:00:00 2001
From: nathanw <nathanw@NetBSD.org>
Date: Wed, 13 Jun 2001 16:06:27 +0000
Subject: [PATCH] The trace_req() function is a no-op; garbage collect it.

---
 sys/kern/kern_sig.c    | 15 ++++++---------
 sys/kern/sys_process.c | 11 +----------
 sys/sys/ptrace.h       |  4 +---
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index f509ef2c731f..847ca23717f7 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_sig.c,v 1.113 2001/06/06 21:37:19 mrg Exp $	*/
+/*	$NetBSD: kern_sig.c,v 1.114 2001/06/13 16:06:28 nathanw Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
@@ -63,7 +63,6 @@
 #include <sys/syslog.h>
 #include <sys/stat.h>
 #include <sys/core.h>
-#include <sys/ptrace.h>
 #include <sys/filedesc.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
@@ -1030,13 +1029,11 @@ issignal(struct proc *p)
 			p->p_xstat = signum;
 			if ((p->p_flag & P_FSTRACE) == 0)
 				psignal(p->p_pptr, SIGCHLD);
-			do {
-				SCHED_LOCK(s);
-				proc_stop(p);
-				mi_switch(p);
-				SCHED_ASSERT_UNLOCKED();
-				splx(s);
-			} while (!trace_req(p) && p->p_flag & P_TRACED);
+			SCHED_LOCK(s);
+			proc_stop(p);
+			mi_switch(p);
+			SCHED_ASSERT_UNLOCKED();
+			splx(s);
 
 			/*
 			 * If we are no longer being traced, or the parent
diff --git a/sys/kern/sys_process.c b/sys/kern/sys_process.c
index 2c172c1b5968..056c8b4fb05c 100644
--- a/sys/kern/sys_process.c
+++ b/sys/kern/sys_process.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sys_process.c,v 1.67 2001/03/17 09:38:36 pooka Exp $	*/
+/*	$NetBSD: sys_process.c,v 1.68 2001/06/13 16:06:28 nathanw Exp $	*/
 
 /*-
  * Copyright (c) 1994 Christopher G. Demetriou.  All rights reserved.
@@ -398,12 +398,3 @@ sys_ptrace(p, v, retval)
 #endif
 	return 0;
 }
-
-int
-trace_req(a1)
-	struct proc *a1;
-{
-
-	/* just return 1 to keep other parts of the system happy */
-	return (1);
-}
diff --git a/sys/sys/ptrace.h b/sys/sys/ptrace.h
index 5c7c009c4cad..f00135589d82 100644
--- a/sys/sys/ptrace.h
+++ b/sys/sys/ptrace.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ptrace.h,v 1.21 1996/02/09 18:25:26 christos Exp $	*/
+/*	$NetBSD: ptrace.h,v 1.22 2001/06/13 16:06:27 nathanw Exp $	*/
 
 /*-
  * Copyright (c) 1984, 1993
@@ -80,8 +80,6 @@ int	process_write_regs __P((struct proc *p, struct reg *regs));
 #define FIX_SSTEP(p)
 #endif
 
-int	trace_req __P((struct proc *));
-
 #else /* !_KERNEL */
 
 #include <sys/cdefs.h>