Wed Jul 27 13:45:49 2011 UTC ()
Include uvm/uvm_extern.h only once.


(uebayasi)
diff -r1.309 -r1.310 src/sys/kern/kern_sig.c
cvs diff -r1.309 -r1.310 src/sys/kern/kern_sig.c (expand / switch to unified diff)

--- src/sys/kern/kern_sig.c 2011/07/26 13:33:43 1.309
+++ src/sys/kern/kern_sig.c 2011/07/27 13:45:49 1.310
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: kern_sig.c,v 1.309 2011/07/26 13:33:43 yamt Exp $ */ 1/* $NetBSD: kern_sig.c,v 1.310 2011/07/27 13:45:49 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc. 4 * Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Andrew Doran. 8 * by Andrew Doran.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -60,27 +60,27 @@ @@ -60,27 +60,27 @@
60 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 60 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
61 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 61 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
62 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 62 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
63 * SUCH DAMAGE. 63 * SUCH DAMAGE.
64 * 64 *
65 * @(#)kern_sig.c 8.14 (Berkeley) 5/14/95 65 * @(#)kern_sig.c 8.14 (Berkeley) 5/14/95
66 */ 66 */
67 67
68/* 68/*
69 * Signal subsystem. 69 * Signal subsystem.
70 */ 70 */
71 71
72#include <sys/cdefs.h> 72#include <sys/cdefs.h>
73__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.309 2011/07/26 13:33:43 yamt Exp $"); 73__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.310 2011/07/27 13:45:49 uebayasi Exp $");
74 74
75#include "opt_ptrace.h" 75#include "opt_ptrace.h"
76#include "opt_compat_sunos.h" 76#include "opt_compat_sunos.h"
77#include "opt_compat_netbsd.h" 77#include "opt_compat_netbsd.h"
78#include "opt_compat_netbsd32.h" 78#include "opt_compat_netbsd32.h"
79#include "opt_pax.h" 79#include "opt_pax.h"
80#include "opt_sa.h" 80#include "opt_sa.h"
81 81
82#define SIGPROP /* include signal properties table */ 82#define SIGPROP /* include signal properties table */
83#include <sys/param.h> 83#include <sys/param.h>
84#include <sys/signalvar.h> 84#include <sys/signalvar.h>
85#include <sys/proc.h> 85#include <sys/proc.h>
86#include <sys/systm.h> 86#include <sys/systm.h>
@@ -97,27 +97,26 @@ __KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v @@ -97,27 +97,26 @@ __KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v
97#include <sys/kauth.h> 97#include <sys/kauth.h>
98#include <sys/acct.h> 98#include <sys/acct.h>
99#include <sys/callout.h> 99#include <sys/callout.h>
100#include <sys/atomic.h> 100#include <sys/atomic.h>
101#include <sys/cpu.h> 101#include <sys/cpu.h>
102#include <sys/module.h> 102#include <sys/module.h>
103#include <sys/sdt.h> 103#include <sys/sdt.h>
104 104
105#ifdef PAX_SEGVGUARD 105#ifdef PAX_SEGVGUARD
106#include <sys/pax.h> 106#include <sys/pax.h>
107#endif /* PAX_SEGVGUARD */ 107#endif /* PAX_SEGVGUARD */
108 108
109#include <uvm/uvm_extern.h> 109#include <uvm/uvm_extern.h>
110#include <uvm/uvm_extern.h> 
111 110
112static pool_cache_t sigacts_cache __read_mostly; 111static pool_cache_t sigacts_cache __read_mostly;
113static pool_cache_t ksiginfo_cache __read_mostly; 112static pool_cache_t ksiginfo_cache __read_mostly;
114static callout_t proc_stop_ch __cacheline_aligned; 113static callout_t proc_stop_ch __cacheline_aligned;
115 114
116#ifdef KERN_SA 115#ifdef KERN_SA
117static pool_cache_t siginfo_cache; 116static pool_cache_t siginfo_cache;
118#endif 117#endif
119 118
120sigset_t contsigmask __cacheline_aligned; 119sigset_t contsigmask __cacheline_aligned;
121static sigset_t stopsigmask __cacheline_aligned; 120static sigset_t stopsigmask __cacheline_aligned;
122sigset_t sigcantmask __cacheline_aligned; 121sigset_t sigcantmask __cacheline_aligned;
123 122