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/linux/common/linux_sig_notalpha.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/compat/linux/common/linux_sig_notalpha.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.30
retrieving revision 1.30.20.2
diff -u -p -r1.30 -r1.30.20.2
--- src/sys/compat/linux/common/linux_sig_notalpha.c	2005/12/11 12:20:19	1.30
+++ src/sys/compat/linux/common/linux_sig_notalpha.c	2006/11/18 21:39:08	1.30.20.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_sig_notalpha.c,v 1.30 2005/12/11 12:20:19 christos Exp $	*/
+/*	$NetBSD: linux_sig_notalpha.c,v 1.30.20.2 2006/11/18 21:39:08 ad Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sig_notalpha.c,v 1.30 2005/12/11 12:20:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sig_notalpha.c,v 1.30.20.2 2006/11/18 21:39:08 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -81,7 +81,6 @@ linux_sys_signal(l, v, retval)
 		syscallarg(int) signum;
 		syscallarg(linux_handler_t) handler;
 	} */ *uap = v;
-	struct proc *p = l->l_proc;
 	struct sigaction nbsa, obsa;
 	int error, sig;
 
@@ -93,7 +92,7 @@ linux_sys_signal(l, v, retval)
 	nbsa.sa_handler = SCARG(uap, handler);
 	sigemptyset(&nbsa.sa_mask);
 	nbsa.sa_flags = SA_RESETHAND | SA_NODEFER;
-	error = sigaction1(p, linux_to_native_signo[sig],
+	error = sigaction1(l, linux_to_native_signo[sig],
 	    &nbsa, &obsa, NULL, 0);
 	if (error == 0)
 		*retval = (int)(long)obsa.sa_handler; /* XXXmanu cast */
@@ -103,17 +102,14 @@ linux_sys_signal(l, v, retval)
 
 /* ARGSUSED */
 int
-linux_sys_siggetmask(l, v, retval)
-	struct lwp *l;
-	void *v;
-	register_t *retval;
+linux_sys_siggetmask(struct lwp *l, void *v,
+    register_t *retval)
 {
-	struct proc *p = l->l_proc;
 	sigset_t bss;
 	linux_old_sigset_t lss;
 	int error;
 
-	error = sigprocmask1(p, SIG_SETMASK, 0, &bss);
+	error = sigprocmask1(l, SIG_SETMASK, 0, &bss);
 	if (error)
 		return (error);
 	native_to_linux_old_sigset(&lss, &bss);
@@ -135,14 +131,13 @@ linux_sys_sigsetmask(l, v, retval)
 	struct linux_sys_sigsetmask_args /* {
 		syscallarg(linux_old_sigset_t) mask;
 	} */ *uap = v;
-	struct proc *p = l->l_proc;
 	sigset_t nbss, obss;
 	linux_old_sigset_t nlss, olss;
 	int error;
 
 	nlss = SCARG(uap, mask);
 	linux_old_to_native_sigset(&nbss, &nlss);
-	error = sigprocmask1(p, SIG_SETMASK, &nbss, &obss);
+	error = sigprocmask1(l, SIG_SETMASK, &nbss, &obss);
 	if (error)
 		return (error);
 	native_to_linux_old_sigset(&olss, &obss);
@@ -151,19 +146,15 @@ linux_sys_sigsetmask(l, v, retval)
 }
 
 int
-linux_sys_sigprocmask(l, v, retval)
-	struct lwp *l;
-	void *v;
-	register_t *retval;
+linux_sys_sigprocmask(struct lwp *l, void *v, register_t *retval)
 {
 	struct linux_sys_sigprocmask_args /* {
 		syscallarg(int) how;
 		syscallarg(const linux_old_sigset_t *) set;
 		syscallarg(linux_old_sigset_t *) oset;
 	} */ *uap = v;
-	struct proc *p = l->l_proc;
 
-	return(linux_sigprocmask1(p, SCARG(uap, how),
+	return(linux_sigprocmask1(l, SCARG(uap, how),
 				SCARG(uap, set), SCARG(uap, oset)));
 }
 #endif /* !__amd64__ */
@@ -173,13 +164,9 @@ linux_sys_sigprocmask(l, v, retval)
  * of sigsuspend(2).
  */
 int
-linux_sys_pause(l, v, retval)
-	struct lwp *l;
-	void *v;
-	register_t *retval;
+linux_sys_pause(struct lwp *l, void *v, register_t *retval)
 {
-	struct proc *p = l->l_proc;
 
-	return (sigsuspend1(p, 0));
+	return (sigsuspend1(l, 0));
 }