Index: kern/kern_thr.c
===================================================================
--- kern/kern_thr.c	(revision 209571)
+++ kern/kern_thr.c	(working copy)
@@ -326,7 +326,7 @@
 					error = 0;
 					if (uap->sig == 0)
 						break;
-					tdsignal(p, ttd, uap->sig, &ksi);
+					tdksignal(ttd, uap->sig, &ksi);
 				}
 			}
 		}
@@ -342,7 +342,7 @@
 		else if (!_SIG_VALID(uap->sig))
 			error = EINVAL;
 		else
-			tdsignal(p, ttd, uap->sig, &ksi);
+			tdksignal(ttd, uap->sig, &ksi);
 	}
 	PROC_UNLOCK(p);
 	return (error);
@@ -384,8 +384,7 @@
 						error = 0;
 						if (uap->sig == 0)
 							break;
-						tdsignal(p, ttd, uap->sig,
-						    &ksi);
+						tdksignal(ttd, uap->sig, &ksi);
 					}
 				}
 			}
@@ -401,7 +400,7 @@
 			else if (!_SIG_VALID(uap->sig))
 				error = EINVAL;
 			else
-				tdsignal(p, ttd, uap->sig, &ksi);
+				tdksignal(ttd, uap->sig, &ksi);
 		}
 	}
 	PROC_UNLOCK(p);
Index: kern/kern_sig.c
===================================================================
--- kern/kern_sig.c	(revision 209571)
+++ kern/kern_sig.c	(working copy)
@@ -107,6 +107,8 @@
 		    ksiginfo_t *ksi);
 static int	issignal(struct thread *td, int stop_allowed);
 static int	sigprop(int sig);
+static int	tdsendsignal(struct proc *p, struct thread *td, int sig,
+		    ksiginfo_t *ksi);
 static void	tdsigwakeup(struct thread *, int, sig_t, int);
 static void	sig_suspend_threads(struct thread *, struct proc *, int);
 static int	filt_sigattach(struct knote *kn);
@@ -1797,7 +1799,7 @@
 		ksi.ksi_pid = td->td_proc->p_pid;
 		ksi.ksi_uid = td->td_ucred->cr_ruid;
 		ksi.ksi_value.sival_ptr = uap->value;
-		error = tdsignal(p, NULL, ksi.ksi_signo, &ksi);
+		error = pksignal(p, ksi.ksi_signo, &ksi);
 	}
 	PROC_UNLOCK(p);
 	return (error);
@@ -1907,7 +1909,7 @@
 		mtx_unlock(&ps->ps_mtx);
 		p->p_code = code;	/* XXX for core dump/debugger */
 		p->p_sig = sig;		/* XXX to verify code */
-		tdsignal(p, td, sig, ksi);
+		tdsendsignal(p, td, sig, ksi);
 	}
 	PROC_UNLOCK(p);
 }
@@ -1962,14 +1964,14 @@
 	ksiginfo_init(&ksi);
 	ksi.ksi_signo = sig;
 	ksi.ksi_code = SI_KERNEL;
-	(void) tdsignal(p, NULL, sig, &ksi);
+	(void) tdsendsignal(p, NULL, sig, &ksi);
 }
 
-void
+int
 pksignal(struct proc *p, int sig, ksiginfo_t *ksi)
 {
 
-	(void) tdsignal(p, NULL, sig, ksi);
+	return (tdsendsignal(p, NULL, sig, ksi));
 }
 
 int
@@ -1992,12 +1994,30 @@
 		if (td == NULL)
 			return (ESRCH);
 	}
-	return (tdsignal(p, td, ksi->ksi_signo, ksi));
+	return (tdsendsignal(p, td, ksi->ksi_signo, ksi));
 }
 
-int
-tdsignal(struct proc *p, struct thread *td, int sig, ksiginfo_t *ksi)
+void
+tdsignal(struct thread *td, int sig)
 {
+	ksiginfo_t ksi;
+
+	ksiginfo_init(&ksi);
+	ksi.ksi_signo = sig;
+	ksi.ksi_code = SI_KERNEL;
+	(void) tdsendsignal(td->td_proc, td, sig, &ksi);
+}
+
+void
+tdksignal(struct thread *td, int sig, ksiginfo_t *ksi)
+{
+
+	(void) tdsendsignal(td->td_proc, td, sig, ksi);
+}
+
+static int
+tdsendsignal(struct proc *p, struct thread *td, int sig, ksiginfo_t *ksi)
+{
 	sig_t action;
 	sigqueue_t *sigqueue;
 	int prop;
@@ -2882,7 +2902,7 @@
 		if (KSI_ONQ(p->p_ksi))
 			return;
 	}
-	tdsignal(p->p_pptr, NULL, SIGCHLD, p->p_ksi);
+	pksignal(p->p_pptr, SIGCHLD, p->p_ksi);
 }
 
 static void
Index: kern/kern_exit.c
===================================================================
--- kern/kern_exit.c	(revision 209571)
+++ kern/kern_exit.c	(working copy)
@@ -732,7 +732,7 @@
 		p->p_oppid = 0;
 		proc_reparent(p, t);
 		PROC_UNLOCK(p);
-		tdsignal(t, NULL, SIGCHLD, p->p_ksi);
+		pksignal(t, SIGCHLD, p->p_ksi);
 		wakeup(t);
 		cv_broadcast(&p->p_pwait);
 		PROC_UNLOCK(t);
Index: kern/kern_exec.c
===================================================================
--- kern/kern_exec.c	(revision 209571)
+++ kern/kern_exec.c	(working copy)
@@ -755,13 +755,13 @@
 	/*
 	 * If tracing the process, trap to debugger so breakpoints
 	 * can be set before the program executes.
-	 * Use tdsignal to deliver signal to current thread, use
+	 * Use tdsignal to deliver signal to current thread, using
 	 * psignal may cause the signal to be delivered to wrong thread
 	 * because that thread will exit, remember we are going to enter
 	 * single thread mode.
 	 */
 	if (p->p_flag & P_TRACED)
-		tdsignal(p, td, SIGTRAP, NULL);
+		tdsignal(td, SIGTRAP);
 
 	/* clear "fork but no exec" flag, as we _are_ execing */
 	p->p_acflag &= ~AFORK;
Index: compat/linux/linux_signal.c
===================================================================
--- compat/linux/linux_signal.c	(revision 209571)
+++ compat/linux/linux_signal.c	(working copy)
@@ -501,7 +501,7 @@
 	/* Repost if we got an error. */
 	if (error && info.ksi_signo) {
 		PROC_LOCK(td->td_proc);
-		tdsignal(td->td_proc, td, info.ksi_signo, &info);
+		tdksignal(td, info.ksi_signo, &info);
 		PROC_UNLOCK(td->td_proc);
 	} else
 		td->td_retval[0] = info.ksi_signo; 
@@ -587,7 +587,7 @@
 	ksi.ksi_pid = proc->p_pid;
 	ksi.ksi_uid = proc->p_ucred->cr_ruid;
 
-	error = tdsignal(p, NULL, ksi.ksi_signo, &ksi);
+	error = pksignal(p, ksi.ksi_signo, &ksi);
 
 out:
 	PROC_UNLOCK(p);
Index: sys/signalvar.h
===================================================================
--- sys/signalvar.h	(revision 209571)
+++ sys/signalvar.h	(working copy)
@@ -330,7 +330,7 @@
 void	execsigs(struct proc *p);
 void	gsignal(int pgid, int sig, ksiginfo_t *ksi);
 void	killproc(struct proc *p, char *why);
-void	pksignal(struct proc *p, int sig, ksiginfo_t *ksi);
+int	pksignal(struct proc *p, int sig, ksiginfo_t *ksi);
 void	pgsigio(struct sigio **, int signum, int checkctty);
 void	pgsignal(struct pgrp *pgrp, int sig, int checkctty, ksiginfo_t *ksi);
 int	postsig(int sig);
@@ -346,8 +346,8 @@
 void	siginit(struct proc *p);
 void	signotify(struct thread *td);
 void	tdsigcleanup(struct thread *td);
-int	tdsignal(struct proc *p, struct thread *td, int sig,
-	    ksiginfo_t *ksi);
+void	tdsignal(struct thread *td, int sig);
+void	tdksignal(struct thread *td, int sig, ksiginfo_t *ksi);
 void	trapsignal(struct thread *td, ksiginfo_t *);
 int	ptracestop(struct thread *td, int sig);
 ksiginfo_t * ksiginfo_alloc(int);