Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/compat/netbsd32/netbsd32_signal.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/compat/netbsd32/netbsd32_signal.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.25
retrieving revision 1.25.6.2
diff -u -p -r1.25 -r1.25.6.2
--- src/sys/compat/netbsd32/netbsd32_signal.c	2007/06/16 20:04:28	1.25
+++ src/sys/compat/netbsd32/netbsd32_signal.c	2007/12/09 19:37:20	1.25.6.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_signal.c,v 1.25 2007/06/16 20:04:28 dsl Exp $	*/
+/*	$NetBSD: netbsd32_signal.c,v 1.25.6.2 2007/12/09 19:37:20 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.25 2007/06/16 20:04:28 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_signal.c,v 1.25.6.2 2007/12/09 19:37:20 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -60,10 +60,7 @@ static void netbsd32_si32_to_si(siginfo_
 
 
 int
-netbsd32_sigaction(l, v, retval)
-	struct lwp *l;
-	void *v;
-	register_t *retval;
+netbsd32_sigaction(struct lwp *l, void *v, register_t *retval)
 {
 	struct netbsd32_sigaction_args /* {
 		syscallarg(int) signum;
@@ -103,10 +100,7 @@ netbsd32_sigaction(l, v, retval)
 }
 
 int
-netbsd32___sigaltstack14(l, v, retval)
-	struct lwp *l;
-	void *v;
-	register_t *retval;
+netbsd32___sigaltstack14(struct lwp *l, void *v, register_t *retval)
 {
 	struct netbsd32___sigaltstack14_args /* {
 		syscallarg(const netbsd32_sigaltstackp_t) nss;
@@ -117,10 +111,7 @@ netbsd32___sigaltstack14(l, v, retval)
 
 /* ARGSUSED */
 int
-netbsd32___sigaction14(l, v, retval)
-	struct lwp *l;
-	void *v;
-	register_t *retval;
+netbsd32___sigaction14(struct lwp *l, void *v, register_t *retval)
 {
 	struct netbsd32___sigaction14_args /* {
 		syscallarg(int) signum;
@@ -158,10 +149,7 @@ netbsd32___sigaction14(l, v, retval)
 
 /* ARGSUSED */
 int
-netbsd32___sigaction_sigtramp(l, v, retval)
-	struct lwp *l;
-	void *v;
-	register_t *retval;
+netbsd32___sigaction_sigtramp(struct lwp *l, void *v, register_t *retval)
 {
 	struct netbsd32___sigaction_sigtramp_args /* {
 		syscallarg(int) signum;
@@ -292,7 +280,7 @@ getucontext32(struct lwp *l, ucontext32_
 {
 	struct proc *p = l->l_proc;
 
-	LOCK_ASSERT(mutex_owned(&p->p_smutex));
+	KASSERT(mutex_owned(&p->p_smutex));
 
 	ucp->uc_flags = 0;
 	ucp->uc_link = (uint32_t)(intptr_t)l->l_ctxlink;
@@ -345,7 +333,7 @@ setucontext32(struct lwp *l, const ucont
 	struct proc *p = l->l_proc;
 	int error;
 
-	LOCK_ASSERT(mutex_owned(&p->p_smutex));
+	KASSERT(mutex_owned(&p->p_smutex));
 
 	if ((ucp->uc_flags & _UC_SIGMASK) != 0) {
 		error = sigprocmask1(l, SIG_SETMASK, &ucp->uc_sigmask, NULL);