 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_sig.c,v 1.307 2011/01/17 07:13:31 uebayasi Exp $	*/
+/*	$NetBSD: kern_sig.c,v 1.308 2011/04/27 00:38:37 rmind Exp $	*/
 /*-
  * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -55,28 +55,32 @@
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS 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.
+ *
  *	@(#)kern_sig.c	8.14 (Berkeley) 5/14/95
  */
 /*
  * Signal subsystem.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.307 2011/01/17 07:13:31 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.308 2011/04/27 00:38:37 rmind Exp $");
 #include "opt_ptrace.h"
 #include "opt_compat_sunos.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_netbsd32.h"
 #include "opt_pax.h"
 #include "opt_sa.h"
 #define	SIGPROP		/* include signal properties table */
 #include <sys/param.h>
 #include <sys/signalvar.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 @@ -95,41 +99,48 @@ __KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v
 #include <sys/callout.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/module.h>
 #include <sys/sdt.h>
 #ifdef PAX_SEGVGUARD
 #include <sys/pax.h>
 #endif /* PAX_SEGVGUARD */
 #include <uvm/uvm_extern.h>
 #include <uvm/uvm_extern.h>
 static pool_cache_t	sigacts_cache	__read_mostly;
 static pool_cache_t	ksiginfo_cache	__read_mostly;
 static callout_t	proc_stop_ch	__cacheline_aligned;
 #ifdef KERN_SA
 static pool_cache_t	siginfo_cache;
 #endif
 sigset_t		contsigmask	__cacheline_aligned;
 static sigset_t		stopsigmask	__cacheline_aligned;
 sigset_t		sigcantmask	__cacheline_aligned;
 static void	ksiginfo_exechook(struct proc *, void *);
 static void	proc_stop_callout(void *);
 static int	sigchecktrace(void);
 static int	sigpost(struct lwp *, sig_t, int, int, int);
 static void	sigput(sigpend_t *, struct proc *, ksiginfo_t *);
 static int	sigunwait(struct proc *, const ksiginfo_t *);
 static void	sigswitch(bool, int, int);
 sigset_t	contsigmask, stopsigmask, sigcantmask;
 static pool_cache_t sigacts_cache; /* memory pool for sigacts structures */
 static void	sigacts_poolpage_free(struct pool *, void *);
 static void	*sigacts_poolpage_alloc(struct pool *, int);
 static callout_t proc_stop_ch;
 static pool_cache_t siginfo_cache;
 static pool_cache_t ksiginfo_cache;
 void (*sendsig_sigcontext_vec)(const struct ksiginfo *, const sigset_t *);
 int (*coredump_vec)(struct lwp *, const char *) =
     (int (*)(struct lwp *, const char *))enosys;
 /*
  * DTrace SDT provider definitions
  */
 SDT_PROBE_DEFINE(proc,,,signal_send,
 	    "struct lwp *", NULL,	/* target thread */
 	    "struct proc *", NULL,	/* target process */
 	    "int", NULL, 		/* signal */
 	    NULL, NULL, NULL, NULL);
 @@ -192,30 +203,30 @@ signal_listener_cb(kauth_cred_t cred, ka
  * signal_init:
+ *
  *	Initialize global signal-related data structures.
  */
 void
 signal_init(void)
+{
 	sigactspool_allocator.pa_pagesz = (PAGE_SIZE)*2;
 	sigacts_cache = pool_cache_init(sizeof(struct sigacts), 0, 0, 0,
 	    "sigacts", sizeof(struct sigacts) > PAGE_SIZE ?
 	    &sigactspool_allocator : NULL, IPL_NONE, NULL, NULL, NULL);
 #ifdef KERN_SA
 	siginfo_cache = pool_cache_init(sizeof(siginfo_t), 0, 0, 0,
 	    "siginfo", NULL, IPL_NONE, NULL, NULL, NULL);
 #endif
 	ksiginfo_cache = pool_cache_init(sizeof(ksiginfo_t), 0, 0, 0,
 	    "ksiginfo", NULL, IPL_VM, NULL, NULL, NULL);
 	exechook_establish(ksiginfo_exechook, NULL);
 	callout_init(&proc_stop_ch, CALLOUT_MPSAFE);
 	callout_setfunc(&proc_stop_ch, proc_stop_callout, NULL);
 	signal_listener = kauth_listen_scope(KAUTH_SCOPE_PROCESS,
 	    signal_listener_cb, NULL);
+}
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: signalvar.h,v 1.78 2011/01/14 02:06:34 rmind Exp $	*/
+/*	$NetBSD: signalvar.h,v 1.79 2011/04/27 00:38:37 rmind Exp $	*/
 /*
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions 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.
 @@ -110,27 +110,27 @@ typedef struct sigstore {
 #define	SA_STOP		0x0004		/* suspend process */
 #define	SA_TTYSTOP	0x0008		/* ditto, from tty */
 #define	SA_IGNORE	0x0010		/* ignore by default */
 #define	SA_CONT		0x0020		/* continue if suspended */
 #define	SA_CANTMASK	0x0040		/* non-maskable, catchable */
 #define	SA_NORESET	0x0080		/* not reset when caught */
 #define	SA_TOLWP	0x0100		/* to LWP that generated, if local */
 #define	SA_TOALL	0x0200		/* always to all LWPs */
 #ifdef _KERNEL
 #include <sys/systm.h>			/* for copyin_t/copyout_t */
-extern sigset_t contsigmask, stopsigmask, sigcantmask;
+extern sigset_t contsigmask, sigcantmask;
 struct vnode;
 /*
  * Machine-independent functions:
  */
 int	coredump_netbsd(struct lwp *, void *);
 void	execsigs(struct proc *);
 int	issignal(struct lwp *);
 void	pgsignal(struct pgrp *, int, int);
 void	kpgsignal(struct pgrp *, struct ksiginfo *, void *, int);
 void	postsig(int);
 void	psignal(struct proc *, int);