Module Name: src
Committed By: kamil
Date: Fri Jun 21 04:28:12 UTC 2019
Modified Files:
src/sys/kern: kern_sig.c
Log Message:
Revert previous
There is fallout in gdb that will be investigated before relanding this.
To generate a diff of this commit:
cvs rdiff -u -r1.363 -r1.364 src/sys/kern/kern_sig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.363 src/sys/kern/kern_sig.c:1.364
--- src/sys/kern/kern_sig.c:1.363 Fri Jun 21 04:02:57 2019
+++ src/sys/kern/kern_sig.c Fri Jun 21 04:28:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.363 2019/06/21 04:02:57 kamil Exp $ */
+/* $NetBSD: kern_sig.c,v 1.364 2019/06/21 04:28:12 kamil Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.363 2019/06/21 04:02:57 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.364 2019/06/21 04:28:12 kamil Exp $");
#include "opt_ptrace.h"
#include "opt_dtrace.h"
@@ -913,7 +913,6 @@ trapsignal(struct lwp *l, ksiginfo_t *ks
mutex_enter(proc_lock);
mutex_enter(p->p_lock);
-repeat:
/*
* If we are exiting, demise now.
*
@@ -927,16 +926,6 @@ repeat:
/* NOTREACHED */
}
- /*
- * The process is already stopping.
- */
- if ((p->p_sflag & PS_STOPPING) != 0) {
- sigswitch(0, p->p_xsig, false);
- mutex_enter(proc_lock);
- mutex_enter(p->p_lock);
- goto repeat; /* XXX */
- }
-
mask = &l->l_sigmask;
ps = p->p_sigacts;
action = SIGACTION_PS(ps, signo).sa_handler;
@@ -1591,7 +1580,6 @@ eventswitch(int code)
KASSERT((code == TRAP_CHLD) || (code == TRAP_LWP) ||
(code == TRAP_EXEC));
-repeat:
/*
* If we are exiting, demise now.
*
@@ -1615,16 +1603,6 @@ repeat:
return;
}
- /*
- * The process is already stopping.
- */
- if ((p->p_sflag & PS_STOPPING) != 0) {
- sigswitch(0, p->p_xsig, false);
- mutex_enter(proc_lock);
- mutex_enter(p->p_lock);
- goto repeat; /* XXX */
- }
-
KSI_INIT_TRAP(&ksi);
ksi.ksi_lid = l->l_lid;
ksi.ksi_info._signo = signo;
@@ -2456,7 +2434,6 @@ proc_stoptrace(int trapno, int sysnum, c
mutex_enter(p->p_lock);
-repeat:
/*
* If we are exiting, demise now.
*
@@ -2478,15 +2455,6 @@ repeat:
return;
}
- /*
- * The process is already stopping.
- */
- if ((p->p_sflag & PS_STOPPING) != 0) {
- sigswitch(0, p->p_xsig, true);
- mutex_enter(p->p_lock);
- goto repeat; /* XXX */
- }
-
/* Needed for ktrace */
ps = p->p_sigacts;
action = SIGACTION_PS(ps, signo).sa_handler;
