[src/trunk]: src/sys/kern Revert previous

[kamil <kamil%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d2af236689f1
branches:  trunk
changeset: 999858:d2af236689f1
user:      kamil <kamil%NetBSD.org@localhost>
date:      Fri Jun 21 04:28:12 2019 +0000

description:
Revert previous

There is fallout in gdb that will be investigated before relanding this.

diffstat:

 sys/kern/kern_sig.c |  36 ++----------------------------------
 1 files changed, 2 insertions(+), 34 deletions(-)

diffs (92 lines):

diff -r 7f0633727bbd -r d2af236689f1 sys/kern/kern_sig.c
--- a/sys/kern/kern_sig.c       Fri Jun 21 04:02:57 2019 +0000
+++ b/sys/kern/kern_sig.c       Fri Jun 21 04:28:12 2019 +0000
@@ -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 @@
        mutex_enter(proc_lock);
        mutex_enter(p->p_lock);
 
-repeat:
        /*
         * If we are exiting, demise now.
         *
@@ -927,16 +926,6 @@
                /* 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 @@
        KASSERT((code == TRAP_CHLD) || (code == TRAP_LWP) ||
                (code == TRAP_EXEC));
 
-repeat:
        /*
         * If we are exiting, demise now.
         *
@@ -1615,16 +1603,6 @@
                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 @@
 
        mutex_enter(p->p_lock);
 
-repeat:
        /*
         * If we are exiting, demise now.
         *
@@ -2478,15 +2455,6 @@
                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;