Nothing sets P_FSTRACE anymore, so remove all what's left of it.

3 files changed, 9 insertions, 28 deletions

diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index bb4c2adfc5f..04b3b75988d 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_exit.c,v 1.60 2006/04/06 21:43:28 mickey Exp $	*/
+/*	$OpenBSD: kern_exit.c,v 1.61 2006/06/15 20:08:01 miod Exp $	*/
 /*	$NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $	*/
 
 /*
@@ -309,17 +309,11 @@ exit1(struct proc *p, int rv, int flags)
 			wakeup(pp);
 	}
 
-	if ((p->p_flag & P_FSTRACE) == 0 && p->p_exitsig != 0)
+	if (p->p_exitsig != 0)
 		psignal(p->p_pptr, P_EXITSIG(p));
 	wakeup(p->p_pptr);
 
 	/*
-	 * Notify procfs debugger
-	 */
-	if (p->p_flag & P_FSTRACE)
-		wakeup(p);
-
-	/*
 	 * Release the process's signal state.
 	 */
 	sigactsfree(p);
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index 68cb16ca000..f95d021c7ae 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_sig.c,v 1.83 2006/06/07 18:58:39 miod Exp $	*/
+/*	$OpenBSD: kern_sig.c,v 1.84 2006/06/15 20:08:01 miod Exp $	*/
 /*	$NetBSD: kern_sig.c,v 1.54 1996/04/22 01:38:32 christos Exp $	*/
 
 /*
@@ -1040,21 +1040,9 @@ issignal(struct proc *p)
 			p->p_xstat = signum;
 
 			SCHED_LOCK(s);	/* protect mi_switch */
-			if (p->p_flag & P_FSTRACE) {
-#ifdef	PROCFS
-				/* procfs debugging */
-				p->p_stat = SSTOP;
-				wakeup(p);
-				mi_switch();
-#else
-				panic("procfs debugging");
-#endif
-			} else {
-				/* ptrace debugging */
-				psignal(p->p_pptr, SIGCHLD);
-				proc_stop(p);
-				mi_switch();
-			}
+			psignal(p->p_pptr, SIGCHLD);
+			proc_stop(p);
+			mi_switch();
 			SCHED_UNLOCK(s);
 
 			/*
diff --git a/sys/sys/proc.h b/sys/sys/proc.h
index 1fa8fde6ec9..212853116c3 100644
--- a/sys/sys/proc.h
+++ b/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: proc.h,v 1.86 2006/05/29 20:42:53 miod Exp $	*/
+/*	$OpenBSD: proc.h,v 1.87 2006/06/15 20:08:02 miod Exp $	*/
 /*	$NetBSD: proc.h,v 1.44 1996/04/22 01:23:21 christos Exp $	*/
 
 /*-
@@ -277,7 +277,6 @@ struct	proc {
 #define	P_OWEUPC	0x008000	/* Owe proc an addupc() at next ast. */
 
 /* XXX Not sure what to do with these, yet. */
-#define	P_FSTRACE	0x010000	/* tracing via fs (elsewhere?) */
 #define	P_SSTEP		0x020000	/* proc needs single-step fixup ??? */
 #define	P_SUGIDEXEC	0x040000	/* last execve() was set[ug]id */
 
@@ -294,13 +293,13 @@ struct	proc {
 #define	P_BITS \
     ("\20\01ADVLOCK\02CTTY\03INMEM\04NOCLDSTOP\05PPWAIT\06PROFIL\07SELECT" \
      "\010SINTR\011SUGID\012SYSTEM\013TIMEOUT\014TRACED\015WAITED\016WEXIT" \
-     "\017EXEC\020PWEUPC\021FSTRACE\022SSTEP\023SUGIDEXEC\024NOCLDWAIT" \
+     "\017EXEC\020PWEUPC\022SSTEP\023SUGIDEXEC\024NOCLDWAIT" \
      "\025NOZOMBIE\026INEXEC\027SYSTRACE\030CONTINUED\031SWAPIN\032BIGLOCK" \
      "\033THREAD\034IGNEXITRV")
 
 /* Macro to compute the exit signal to be delivered. */
 #define P_EXITSIG(p) \
-    (((p)->p_flag & (P_TRACED | P_FSTRACE)) ? SIGCHLD : (p)->p_exitsig)
+    (((p)->p_flag & P_TRACED) ? SIGCHLD : (p)->p_exitsig)
 
 #ifndef __HAVE_CPUINFO
 /*