Back our kernel support for reliable signal queues.

Requested by:	rwatson, phk, and many others

9 files changed, 45 insertions, 372 deletions

diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index d58e7df..49bb739 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -348,8 +348,6 @@ proc0_init(void *dummy __unused)
 	LIST_INIT(&pgrp0.pg_members);
 	LIST_INSERT_HEAD(&pgrp0.pg_members, p, p_pglist);
 
-	TAILQ_INIT(&p->p_sigq);
-
 	pgrp0.pg_session = &session0;
 	mtx_init(&session0.s_mtx, "session", NULL, MTX_DEF);
 	session0.s_count = 1;
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c
index 572aab3..1725d54 100644
--- a/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@ -67,7 +67,6 @@
 #ifdef KTRACE
 #include <sys/ktrace.h>
 #endif
-#include <sys/ksiginfo.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
@@ -245,7 +244,7 @@ exit1(td, rv)
 	 */
 	PROC_LOCK(p);
 	p->p_flag &= ~(P_TRACED | P_PPWAIT);
-	signal_delete(p, NULL, 0);
+	SIGEMPTYSET(p->p_siglist);
 	PROC_UNLOCK(p);
 	if (timevalisset(&p->p_realtimer.it_value))
 		callout_stop(&p->p_itcallout);
@@ -474,12 +473,6 @@ exit1(td, rv)
 	 */
 	if (p->p_flag & P_KTHREAD)
 		wakeup(p);
-
-	/*
-	 * And now, kill off its signals...
-	 */
-	signal_delete(p, NULL, 0);
-
 	PROC_UNLOCK(p);
 	
 	/*
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index c8182f9..da7ca7d 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -605,7 +605,6 @@ again:
 	LIST_INSERT_AFTER(p1, p2, p_pglist);
 	PGRP_UNLOCK(p1->p_pgrp);
 	LIST_INIT(&p2->p_children);
-	TAILQ_INIT(&p2->p_sigq);
 
 	callout_init(&p2->p_itcallout, 0);
 
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index 95e9a68..08ef71f 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -37,7 +37,6 @@
 #include <sys/sx.h>
 #include <sys/unistd.h>
 #include <sys/wait.h>
-#include <sys/ksiginfo.h>
 
 #include <machine/stdarg.h>
 
@@ -145,16 +144,16 @@ kthread_suspend(struct proc *p, int timo)
 {
 	/*
 	 * Make sure this is indeed a system process and we can safely
-	 * use the signal queue.
+	 * use the p_siglist field.
 	 */
 	PROC_LOCK(p);
 	if ((p->p_flag & P_KTHREAD) == 0) {
 		PROC_UNLOCK(p);
 		return (EINVAL);
 	}
-	signal_add(p, NULL, SIGSTOP);
+	SIGADDSET(p->p_siglist, SIGSTOP);
 	wakeup(p);
-	return msleep(&p->p_sigq, &p->p_mtx, PPAUSE | PDROP, "suspkt", timo);
+	return msleep(&p->p_siglist, &p->p_mtx, PPAUSE | PDROP, "suspkt", timo);
 }
 
 int
@@ -169,9 +168,9 @@ kthread_resume(struct proc *p)
 		PROC_UNLOCK(p);
 		return (EINVAL);
 	}
-	signal_delete(p, NULL, SIGSTOP);
+	SIGDELSET(p->p_siglist, SIGSTOP);
 	PROC_UNLOCK(p);
-	wakeup(&p->p_sigq);
+	wakeup(&p->p_siglist);
 	return (0);
 }
 
@@ -179,9 +178,9 @@ void
 kthread_suspend_check(struct proc *p)
 {
 	PROC_LOCK(p);
-	while (signal_queued(p, SIGSTOP)) {
-		wakeup(&p->p_sigq);
-		msleep(&p->p_sigq, &p->p_mtx, PPAUSE, "ktsusp", 0);
+	while (SIGISMEMBER(p->p_siglist, SIGSTOP)) {
+		wakeup(&p->p_siglist);
+		msleep(&p->p_siglist, &p->p_mtx, PPAUSE, "ktsusp", 0);
 	}
 	PROC_UNLOCK(p);
 }
diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c
index e7fce8a..633c66e 100644
--- a/sys/kern/kern_proc.c
+++ b/sys/kern/kern_proc.c
@@ -58,7 +58,6 @@
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 #endif
-#include <sys/ksiginfo.h>
 
 #include <vm/vm.h>
 #include <vm/vm_extern.h>
@@ -409,7 +408,7 @@ kse_create(struct thread *td, struct kse_create_args *uap)
 		      RANGEOF(struct kse, ke_startcopy, ke_endcopy));
 #endif
 		PROC_LOCK(p);
-		if (signal_pending(p))
+		if (SIGPENDING(p))
 			newke->ke_flags |= KEF_ASTPENDING;
 		PROC_UNLOCK(p);
 		mtx_lock_spin(&sched_lock);
@@ -1015,7 +1014,7 @@ fill_kinfo_proc(p, kp)
 		strncpy(kp->ki_comm, p->p_comm, sizeof(kp->ki_comm) - 1);
 		strncpy(kp->ki_ocomm, p->p_comm, sizeof(kp->ki_ocomm) - 1);
 	}
-	ksiginfo_to_sigset_t(p, &kp->ki_siglist);
+	kp->ki_siglist = p->p_siglist;
 	kp->ki_sigmask = p->p_sigmask;
 	kp->ki_xstat = p->p_xstat;
 	kp->ki_acflag = p->p_acflag;
diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index ada2016..f6fa38b 100644
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1,6 +1,4 @@
 /*
- * Copyright (c) 2002 New Gold Technoloy.  All rights reserved.
- * Copyright (c) 2002 Juli Mallett.  All rights reserved.
  * Copyright (c) 1982, 1986, 1989, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  * (c) UNIX System Laboratories, Inc.
@@ -72,7 +70,6 @@
 #include <sys/sysctl.h>
 #include <sys/malloc.h>
 #include <sys/unistd.h>
-#include <sys/ksiginfo.h>
 
 #include <machine/cpu.h>
 
@@ -119,9 +116,6 @@ static int	do_coredump = 1;
 SYSCTL_INT(_kern, OID_AUTO, coredump, CTLFLAG_RW,
 	&do_coredump, 0, "Enable/Disable coredumps");
 
-static int stopmask =
-    sigmask(SIGSTOP) | sigmask(SIGTSTP) | sigmask(SIGTTIN) | sigmask(SIGTTOU);
-
 /*
  * Signal properties and actions.
  * The array below categorizes the signals and their default actions
@@ -184,12 +178,12 @@ cursig(struct thread *td)
 
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 	mtx_assert(&sched_lock, MA_NOTOWNED);
-	return (signal_pending(p) ? issignal(td) : 0);
+	return (SIGPENDING(p) ? issignal(td) : 0);
 }
 
 /*
  * Arrange for ast() to handle unmasked pending signals on return to user
- * mode.  This must be called whenever a signal is added to p_sigq or
+ * mode.  This must be called whenever a signal is added to p_siglist or
  * unmasked in p_sigmask.
  */
 void
@@ -200,7 +194,7 @@ signotify(struct proc *p)
 
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 	mtx_lock_spin(&sched_lock);
-	if (signal_pending(p)) {
+	if (SIGPENDING(p)) {
 		p->p_sflag |= PS_NEEDSIGCHK;
 		/* XXXKSE for now punish all KSEs */
 		FOREACH_KSEGRP_IN_PROC(p, kg) {
@@ -347,7 +341,7 @@ kern_sigaction(td, sig, act, oact, old)
 		    (sigprop(sig) & SA_IGNORE &&
 		     ps->ps_sigact[_SIG_IDX(sig)] == SIG_DFL)) {
 			/* never to be seen again */
-			signal_delete(p, NULL, sig);
+			SIGDELSET(p->p_siglist, sig);
 			if (sig != SIGCONT)
 				/* easier in psignal */
 				SIGADDSET(p->p_sigignore, sig);
@@ -500,7 +494,7 @@ execsigs(p)
 		if (sigprop(sig) & SA_IGNORE) {
 			if (sig != SIGCONT)
 				SIGADDSET(p->p_sigignore, sig);
-			signal_delete(p, NULL, sig);
+			SIGDELSET(p->p_siglist, sig);
 		}
 		ps->ps_sigact[_SIG_IDX(sig)] = SIG_DFL;
 	}
@@ -647,7 +641,7 @@ sigpending(td, uap)
 
 	mtx_lock(&Giant);
 	PROC_LOCK(p);
-	ksiginfo_to_sigset_t(p, &siglist);
+	siglist = p->p_siglist;
 	PROC_UNLOCK(p);
 	mtx_unlock(&Giant);
 	error = copyout(&siglist, uap->set, sizeof(sigset_t));
@@ -670,12 +664,10 @@ osigpending(td, uap)
 	struct osigpending_args *uap;
 {
 	struct proc *p = td->td_proc;
-	sigset_t siglist;
 
 	mtx_lock(&Giant);
 	PROC_LOCK(p);
-	ksiginfo_to_sigset_t(p, &siglist);
-	SIG2OSIG(siglist, td->td_retval[0]);
+	SIG2OSIG(p->p_siglist, td->td_retval[0]);
 	PROC_UNLOCK(p);
 	mtx_unlock(&Giant);
 	return (0);
@@ -1316,7 +1308,7 @@ psignal(p, sig)
 	}
 
 	if (prop & SA_CONT)
-		signal_delete_mask(p, stopmask);
+		SIG_STOPSIGMASK(p->p_siglist);
 
 	if (prop & SA_STOP) {
 		/*
@@ -1329,10 +1321,10 @@ psignal(p, sig)
 		    (p->p_pgrp->pg_jobc == 0) &&
 		    (action == SIG_DFL))
 		        return;
-		signal_delete_mask(p, sigmask(SIGCONT));
+		SIG_CONTSIGMASK(p->p_siglist);
 		p->p_flag &= ~P_CONTINUED;
 	}
-	signal_add(p, NULL, sig);
+	SIGADDSET(p->p_siglist, sig);
 	signotify(p);			/* uses schedlock */
 
 	/*
@@ -1370,10 +1362,10 @@ psignal(p, sig)
 		if (prop & SA_CONT) {
 			/*
 			 * If SIGCONT is default (or ignored), we continue the
-			 * process but don't leave the signal in p_sigq as it
-			 * has no further action.  If SIGCONT is held, we
+			 * process but don't leave the signal in p_siglist as
+			 * it has no further action.  If SIGCONT is held, we
 			 * continue the process and leave the signal in
-			 * p_sigq.  If the process catches SIGCONT, let it
+			 * p_siglist.  If the process catches SIGCONT, let it
 			 * handle the signal itself.  If it isn't waiting on
 			 * an event, it goes back to run state.
 			 * Otherwise, process goes back to sleep state.
@@ -1381,7 +1373,7 @@ psignal(p, sig)
 			p->p_flag &= ~P_STOPPED_SIG;
 			p->p_flag |= P_CONTINUED;
 			if (action == SIG_DFL) {
-				signal_delete(p, NULL, sig);
+				SIGDELSET(p->p_siglist, sig);
 			} else if (action == SIG_CATCH) {
 				/*
 				 * The process wants to catch it so it needs
@@ -1411,7 +1403,7 @@ psignal(p, sig)
 			 * Just make sure the signal STOP bit set.
 			 */
 			p->p_flag |= P_STOPPED_SIG;
-			signal_delete(p, NULL, sig);
+			SIGDELSET(p->p_siglist, sig);
 			goto out;
 		}
 
@@ -1445,7 +1437,7 @@ psignal(p, sig)
 			/*
 			 * Already active, don't need to start again.
 			 */
-			signal_delete(p, NULL, sig);
+			SIGDELSET(p->p_siglist, sig);
 			goto out;
 		}
 		if ((p->p_flag & P_TRACED) || (action != SIG_DFL) ||
@@ -1469,7 +1461,7 @@ psignal(p, sig)
 				mtx_unlock_spin(&sched_lock);
 				stop(p);
 				p->p_xstat = sig;
-				signal_delete(p, NULL, sig);
+				SIGDELSET(p->p_siglist, sig);
 				PROC_LOCK(p->p_pptr);
 				if ((p->p_pptr->p_procsig->ps_flag &
 					PS_NOCLDSTOP) == 0) {
@@ -1486,7 +1478,7 @@ psignal(p, sig)
 		/* NOTREACHED */
 	} else {
 		/* Not in "NORMAL" state. discard the signal. */
-		signal_delete(p, NULL, sig);
+		SIGDELSET(p->p_siglist, sig);
 		goto out;
 	}
 
@@ -1561,7 +1553,7 @@ tdsignal(struct thread *td, int sig, sig_t action)
 			 * be awakened.
 			 */
 			if ((prop & SA_CONT) && action == SIG_DFL) {
-				signal_delete(p, NULL, sig);
+				SIGDELSET(p->p_siglist, sig);
 				return;
 			}
 
@@ -1617,13 +1609,13 @@ issignal(td)
 	for (;;) {
 		int traced = (p->p_flag & P_TRACED) || (p->p_stops & S_SIG);
 
-		ksiginfo_to_sigset_t(p, &mask);
+		mask = p->p_siglist;
 		SIGSETNAND(mask, p->p_sigmask);
 		if (p->p_flag & P_PPWAIT)
 			SIG_STOPSIGMASK(mask);
 		if (SIGISEMPTY(mask))		/* no signal to send */
 			return (0);
-		sig = signal_queued_mask(p, mask);
+		sig = sig_ffs(&mask);
 		prop = sigprop(sig);
 
 		_STOPEVENT(p, S_SIG, sig);
@@ -1633,7 +1625,7 @@ issignal(td)
 		 * only if P_TRACED was on when they were posted.
 		 */
 		if (SIGISMEMBER(p->p_sigignore, sig) && (traced == 0)) {
-			signal_delete(p, NULL, sig);
+			SIGDELSET(p->p_siglist, sig);
 			continue;
 		}
 		if (p->p_flag & P_TRACED && (p->p_flag & P_PPWAIT) == 0) {
@@ -1668,16 +1660,16 @@ issignal(td)
 			 * then it will leave it in p->p_xstat;
 			 * otherwise we just look for signals again.
 			 */
-			signal_delete(p, NULL, sig);	/* clear old signal */
+			SIGDELSET(p->p_siglist, sig);	/* clear old signal */
 			sig = p->p_xstat;
 			if (sig == 0)
 				continue;
 
 			/*
-			 * Put the new signal into p_sigq.  If the signal
-			 * is being masked, look for other signals.
+			 * Put the new signal into p_siglist.  If the
+			 * signal is being masked, look for other signals.
 			 */
-			psignal(p, sig);
+			SIGADDSET(p->p_siglist, sig);
 			if (SIGISMEMBER(p->p_sigmask, sig))
 				continue;
 			signotify(p);
@@ -1767,7 +1759,7 @@ issignal(td)
 			 */
 			return (sig);
 		}
-		signal_delete(p, NULL, sig);		/* take the signal! */
+		SIGDELSET(p->p_siglist, sig);		/* take the signal! */
 	}
 	/* NOTREACHED */
 }
@@ -1808,7 +1800,7 @@ postsig(sig)
 
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 	ps = p->p_sigacts;
-	signal_delete(p, NULL, sig);
+	SIGDELSET(p->p_siglist, sig);
 	action = ps->ps_sigact[_SIG_IDX(sig)];
 #ifdef KTRACE
 	if (KTRPOINT(td, KTR_PSIG))
diff --git a/sys/kern/subr_sigq.c b/sys/kern/subr_sigq.c
deleted file mode 100644
index 8f960b7..0000000
--- a/sys/kern/subr_sigq.c
+++ /dev/null
@@ -1,301 +0,0 @@
-/*-
- * Copyright (c) 2002 New Gold Technology.  All rights reserved.
- * Copyright (c) 2002 Juli Mallett.  All rights reserved.
- *
- * This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
- * FreeBSD project.  Redistribution and use in source and binary forms, with
- * or without modification, are permitted provided that the following
- * conditions are met:
- *
- * 1. Redistribution of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistribution in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/systm.h>
-#include <sys/signalvar.h>
-#include <sys/proc.h>
-#include <sys/errno.h>
-#include <sys/lock.h>
-#include <sys/malloc.h>
-#include <sys/mutex.h>
-#include <sys/signal.h>
-#include <sys/ksiginfo.h>
-
-MALLOC_DEFINE(M_KSIGINFO, "ksiginfos", "Kernel signal info structures");
-
-int
-ksiginfo_alloc(struct ksiginfo **ksip, int signo)
-{
-	int error;
-	struct ksiginfo *ksi;
-
-	error = 0;
-
-	ksi = malloc(sizeof *ksi, M_KSIGINFO, M_ZERO | M_NOWAIT);
-	if (ksi == NULL) {
-		panic("Unable to allocate kernel signal info structure.");
-		error = ENOMEM;
-		goto out;
-	}
-	ksi->ksi_signo = signo;
-	if (curproc != NULL) {
-		ksi->ksi_pid = curproc->p_pid;
-		ksi->ksi_ruid = curproc->p_ucred->cr_uid;
-	}
-out:
-	*ksip = ksi;
-	return (error);
-}
-
-int
-ksiginfo_dequeue(struct ksiginfo **ksip, struct proc *p, int signo)
-{
-	int error;
-	struct ksiginfo *ksi;
-
-	error = 0;
-	ksi = NULL;
-
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	if (TAILQ_EMPTY(&p->p_sigq)) {
-		error = EDOOFUS;
-		goto out;
-	}
-	if (!signo) {
-		ksi = TAILQ_FIRST(&p->p_sigq);
-		goto out;
-	}
-	TAILQ_FOREACH(ksi, &p->p_sigq, ksi_queue) {
-		if (ksi->ksi_signo == signo)
-			goto out;
-	}
-	error = ESRCH;
-	ksi = NULL;
-out:
-	if (ksi != NULL)
-		TAILQ_REMOVE(&p->p_sigq, ksi, ksi_queue);
-	*ksip = ksi;
-	return (error);
-}
-
-int
-ksiginfo_destroy(struct ksiginfo **ksip)
-{
-	int error;
-	struct ksiginfo *ksi;
-
-	error = 0;
-
-	ksi = *ksip;
-	if (ksi == NULL) {
-		error = EDOOFUS;
-		goto out;
-	}
-	free(ksi, M_KSIGINFO);
-	ksi = NULL;
-out:
-	*ksip = ksi;
-	return (error);
-}
-
-int
-ksiginfo_to_sigset_t(struct proc *p, sigset_t *setp)
-{
-	int error;
-	sigset_t set;
-	struct ksiginfo *ksi;
-
-	error = 0;
-	SIGEMPTYSET(set);
-
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	/*
-	 * We could set EDOOFUS here, however if there are no queued
-	 * signals, then an empty signal set _is_ valid.
-	 */
-	if (TAILQ_EMPTY(&p->p_sigq))
-		goto out;
-	TAILQ_FOREACH(ksi, &p->p_sigq, ksi_queue)
-		SIGADDSET(set, ksi->ksi_signo);
-out:
-	*setp = set;
-	return (error);
-}
-
-int
-signal_add(struct proc *p, struct ksiginfo *ksi, int signo)
-{
-	int error;
-	
-	error = 0;
-
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	if (ksi == NULL) {
-		PROC_UNLOCK(p);
-		error = ksiginfo_alloc(&ksi, signo);
-		PROC_LOCK(p);
-		if (error)
-			goto out;
-	}
-	TAILQ_INSERT_HEAD(&p->p_sigq, ksi, ksi_queue);
-out:
-	return (error);
-}
-
-int
-signal_delete(struct proc *p, struct ksiginfo *ksi, int signo)
-{
-	int error;
-
-	error = 0;
-
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	if (ksi == NULL) {
-		while (signal_queued(p, signo)) {
-			error = ksiginfo_dequeue(&ksi, p, signo);
-			if (error)
-				goto out;
-			error = ksiginfo_destroy(&ksi);
-			if (error)
-				goto out;
-		}
-	}
-out:
-	if (ksi != NULL) {
-		TAILQ_REMOVE(&p->p_sigq, ksi, ksi_queue);
-		ksiginfo_destroy(&ksi);
-	}
-	return (error);
-}
-
-int
-signal_delete_mask(struct proc *p, int mask)
-{
-	int error;
-	struct ksiginfo *ksi, *prev;
-
-	error = 0;
-	ksi = prev = NULL;
-
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	if (TAILQ_EMPTY(&p->p_sigq))
-		goto out;
-	TAILQ_FOREACH(ksi, &p->p_sigq, ksi_queue) {
-		if (prev != NULL) {
-			TAILQ_REMOVE(&p->p_sigq, prev, ksi_queue);
-			error = ksiginfo_destroy(&prev);
-			if (error)
-				goto out;
-		}
-		if (sigmask(ksi->ksi_signo) & mask)
-			prev = ksi;
-	}
-	if (prev != NULL) {
-		TAILQ_REMOVE(&p->p_sigq, prev, ksi_queue);
-		error = ksiginfo_destroy(&prev);
-		/*
-		 * XXX - Could just fall off the bottom...
-		 */
-		if (error)
-			goto out;
-	}
-out:
-	return (error);
-}
-
-int
-signal_pending(struct proc *p)
-{
-	int error, pending;
-	sigset_t set;
-
-	error = 0;
-	pending = 0;
-
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	if (TAILQ_EMPTY(&p->p_sigq))
-		goto out;
-	if (p->p_flag & P_TRACED) {
-		pending = 1;
-		goto out;
-	}
-	error = ksiginfo_to_sigset_t(p, &set);
-	if (error)
-		goto out;
-	pending = !sigsetmasked(&set, &p->p_sigmask);
-	if (pending)
-		goto out;
-out:
-	return (pending);
-}
-
-int
-signal_queued(struct proc *p, int signo)
-{
-	int error, pending;
-	struct ksiginfo *ksi;
-
-	error = 0;
-	pending = 0;
-	ksi = NULL;
-
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	if (TAILQ_EMPTY(&p->p_sigq))
-		goto out;
-	/*
-	 * Since we know the queue is not empty, we can just do
-	 * pending = TAILQ_FIRST(&p->p_sigq)->ksi_signo, if the
-	 * signo is 0, however since we have to use at least one
-	 * more TailQ manipulation macro either way, might as well
-	 * just do it like this, as I think it optimises better,
-	 * even if the failure case is more expensive.
-	 */
-	TAILQ_FOREACH(ksi, &p->p_sigq, ksi_queue) {
-		pending = !signo || ksi->ksi_signo == signo;
-		if (pending)
-			goto out;
-	}
-out:
-	return (pending);
-}
-
-int
-signal_queued_mask(struct proc *p, sigset_t mask)
-{
-	int pending;
-	struct ksiginfo *ksi;
-
-	pending = 0;
-	ksi = NULL;
-
-	PROC_LOCK_ASSERT(p, MA_OWNED);
-	if (TAILQ_EMPTY(&p->p_sigq))
-		goto out;
-	TAILQ_FOREACH(ksi, &p->p_sigq, ksi_queue) {
-		if (SIGISMEMBER(mask, ksi->ksi_signo)) {
-			pending = ksi->ksi_signo;
-			goto out;
-		}
-	}
-out:
-	return (pending);
-}
diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c
index 4fc6f81..2ec3fb1 100644
--- a/sys/kern/subr_trap.c
+++ b/sys/kern/subr_trap.c
@@ -54,8 +54,6 @@
 #include <sys/signalvar.h>
 #include <sys/systm.h>
 #include <sys/vmmeter.h>
-#include <sys/malloc.h>
-#include <sys/ksiginfo.h>
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 
@@ -82,7 +80,7 @@ userret(td, frame, oticks)
 	mtx_lock(&Giant);
 	PROC_LOCK(p);
 	mtx_lock_spin(&sched_lock);
-	if (signal_pending(p) && ((p->p_sflag & PS_NEEDSIGCHK) == 0 ||
+	if (SIGPENDING(p) && ((p->p_sflag & PS_NEEDSIGCHK) == 0 ||
 	    (td->td_kse->ke_flags & KEF_ASTPENDING) == 0))
 		printf("failed to set signal flags properly for ast()\n");
 	mtx_unlock_spin(&sched_lock);
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 590e8de..c075a47 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -102,7 +102,6 @@
 #include <sys/malloc.h>
 #include <sys/filedesc.h>
 #include <sys/sysctl.h>
-#include <sys/ksiginfo.h>
 
 #include <vm/vm.h>
 #include <vm/pmap.h>
@@ -1842,24 +1841,21 @@ int
 ttycheckoutq(struct tty *tp, int wait)
 {
 	int hiwat, s;
-	sigset_t oldmask, newmask;
+	sigset_t oldmask;
 
 	hiwat = tp->t_ohiwat;
 	SIGEMPTYSET(oldmask);
 	s = spltty();
 	if (wait)
-		ksiginfo_to_sigset_t(curproc, &oldmask);
+		oldmask = curproc->p_siglist;
 	if (tp->t_outq.c_cc > hiwat + OBUFSIZ + 100)
 		while (tp->t_outq.c_cc > hiwat) {
 			ttstart(tp);
 			if (tp->t_outq.c_cc <= hiwat)
 				break;
-			if (!wait) {
-				ksiginfo_to_sigset_t(curproc, &newmask);
-				if (SIGSETEQ(newmask, oldmask)) {
-					splx(s);
-					return (0);
-				}
+			if (!(wait && SIGSETEQ(curproc->p_siglist, oldmask))) {
+				splx(s);
+				return (0);
 			}
 			SET(tp->t_state, TS_SO_OLOWAT);
 			tsleep(TSA_OLOWAT(tp), PZERO - 1, "ttoutq", hz);