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.22
retrieving revision 1.22.6.4
diff -u -p -r1.22 -r1.22.6.4
--- src/sys/compat/linux/common/linux_sig_notalpha.c	2000/03/30 11:27:17	1.22
+++ src/sys/compat/linux/common/linux_sig_notalpha.c	2002/02/28 04:12:57	1.22.6.4
@@ -1,4 +1,4 @@
-/*	$NetBSD: linux_sig_notalpha.c,v 1.22 2000/03/30 11:27:17 augustss Exp $	*/
+/*	$NetBSD: linux_sig_notalpha.c,v 1.22.6.4 2002/02/28 04:12:57 nathanw Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -40,9 +40,13 @@
  * heavily from: svr4_signal.c,v 1.7 1995/01/09 01:04:21 christos Exp
  */
 
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: linux_sig_notalpha.c,v 1.22.6.4 2002/02/28 04:12:57 nathanw Exp $");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
+#include <sys/lwp.h>
 #include <sys/filedesc.h>
 #include <sys/mount.h>
 #include <sys/kernel.h>
@@ -67,8 +71,8 @@
  * sigaction() apply.
  */
 int
-linux_sys_signal(p, v, retval)
-	struct proc *p;
+linux_sys_signal(l, v, retval)
+	struct lwp *l;
 	void *v;
 	register_t *retval;
 {
@@ -76,6 +80,7 @@ linux_sys_signal(p, 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;
 
@@ -97,11 +102,12 @@ linux_sys_signal(p, v, retval)
 
 /* ARGSUSED */
 int
-linux_sys_siggetmask(p, v, retval)
-	struct proc *p;
+linux_sys_siggetmask(l, v, retval)
+	struct lwp *l;
 	void *v;
 	register_t *retval;
 {
+	struct proc *p = l->l_proc;
 	sigset_t bss;
 	linux_old_sigset_t lss;
 	int error;
@@ -109,7 +115,7 @@ linux_sys_siggetmask(p, v, retval)
 	error = sigprocmask1(p, SIG_SETMASK, 0, &bss);
 	if (error)
 		return (error);
-	native_to_linux_old_sigset(&bss, &lss);
+	native_to_linux_old_sigset(&lss, &bss);
 	return (0);
 }
 
@@ -120,31 +126,32 @@ linux_sys_siggetmask(p, v, retval)
  * they are here, and have not been mapped directly.
  */
 int
-linux_sys_sigsetmask(p, v, retval)
-	struct proc *p;
+linux_sys_sigsetmask(l, v, retval)
+	struct lwp *l;
 	void *v;
 	register_t *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(&nlss, &nbss);
+	linux_old_to_native_sigset(&nbss, &nlss);
 	error = sigprocmask1(p, SIG_SETMASK, &nbss, &obss);
 	if (error)
 		return (error);
-	native_to_linux_old_sigset(&obss, &olss);
+	native_to_linux_old_sigset(&olss, &obss);
 	*retval = olss;
 	return (0);
 }
 
 int
-linux_sys_sigprocmask(p, v, retval)
-	struct proc *p;
+linux_sys_sigprocmask(l, v, retval)
+	struct lwp *l;
 	void *v;
 	register_t *retval;
 {
@@ -153,6 +160,7 @@ linux_sys_sigprocmask(p, v, retval)
 		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), 
 				SCARG(uap, set), SCARG(uap, oset)));
@@ -163,11 +171,12 @@ linux_sys_sigprocmask(p, v, retval)
  * of sigsuspend(2).
  */
 int
-linux_sys_pause(p, v, retval)
-	struct proc *p;
+linux_sys_pause(l, v, retval)
+	struct lwp *l;
 	void *v;	
 	register_t *retval;
 {	
+	struct proc *p = l->l_proc;
 
 	return (sigsuspend1(p, 0));
 }