Wed Jul 27 14:35:34 2011 UTC ()
These don't need uvm/uvm_extern.h.


(uebayasi)
diff -r1.127 -r1.128 src/sys/kern/kern_clock.c
diff -r1.29 -r1.30 src/sys/kern/kern_condvar.c
diff -r1.29 -r1.30 src/sys/kern/kern_turnstile.c
diff -r1.63 -r1.64 src/sys/kern/kern_ksyms.c
diff -r1.40 -r1.41 src/sys/kern/kern_sleepq.c
diff -r1.208 -r1.209 src/sys/kern/kern_subr.c
diff -r1.168 -r1.169 src/sys/kern/kern_time.c
diff -r1.26 -r1.27 src/sys/kern/sched_4bsd.c
diff -r1.13 -r1.14 src/sys/kern/subr_percpu.c
diff -r1.30 -r1.31 src/sys/kern/subr_workqueue.c
diff -r1.126 -r1.127 src/sys/kern/sys_generic.c
diff -r1.140 -r1.141 src/sys/kern/uipc_mbuf.c
diff -r1.145 -r1.146 src/sys/kern/uipc_syscalls.c
cvs diff -r1.127 -r1.128 src/sys/kern/kern_clock.c (expand / switch to unified diff)

--- src/sys/kern/kern_clock.c 2010/12/20 00:25:46 1.127
+++ src/sys/kern/kern_clock.c 2011/07/27 14:35:33 1.128
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: kern_clock.c,v 1.127 2010/12/20 00:25:46 matt Exp $ */ 1/* $NetBSD: kern_clock.c,v 1.128 2011/07/27 14:35:33 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2000, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc. 4 * Copyright (c) 2000, 2004, 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 Jason R. Thorpe of the Numerical Aerospace Simulation Facility, 8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
9 * NASA Ames Research Center. 9 * NASA Ames Research Center.
10 * This code is derived from software contributed to The NetBSD Foundation 10 * This code is derived from software contributed to The NetBSD Foundation
11 * by Charles M. Hannum. 11 * by Charles M. Hannum.
12 * 12 *
13 * Redistribution and use in source and binary forms, with or without 13 * Redistribution and use in source and binary forms, with or without
14 * modification, are permitted provided that the following conditions 14 * modification, are permitted provided that the following conditions
@@ -59,48 +59,46 @@ @@ -59,48 +59,46 @@
59 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 59 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
60 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 60 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
61 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 61 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
62 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 62 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
63 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 63 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
64 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 64 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
65 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 65 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
66 * SUCH DAMAGE. 66 * SUCH DAMAGE.
67 * 67 *
68 * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94 68 * @(#)kern_clock.c 8.5 (Berkeley) 1/21/94
69 */ 69 */
70 70
71#include <sys/cdefs.h> 71#include <sys/cdefs.h>
72__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.127 2010/12/20 00:25:46 matt Exp $"); 72__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.128 2011/07/27 14:35:33 uebayasi Exp $");
73 73
74#include "opt_ntp.h" 74#include "opt_ntp.h"
75#include "opt_perfctrs.h" 75#include "opt_perfctrs.h"
76 76
77#include <sys/param.h> 77#include <sys/param.h>
78#include <sys/systm.h> 78#include <sys/systm.h>
79#include <sys/callout.h> 79#include <sys/callout.h>
80#include <sys/kernel.h> 80#include <sys/kernel.h>
81#include <sys/proc.h> 81#include <sys/proc.h>
82#include <sys/resourcevar.h> 82#include <sys/resourcevar.h>
83#include <sys/signalvar.h> 83#include <sys/signalvar.h>
84#include <sys/sysctl.h> 84#include <sys/sysctl.h>
85#include <sys/timex.h> 85#include <sys/timex.h>
86#include <sys/sched.h> 86#include <sys/sched.h>
87#include <sys/time.h> 87#include <sys/time.h>
88#include <sys/timetc.h> 88#include <sys/timetc.h>
89#include <sys/cpu.h> 89#include <sys/cpu.h>
90#include <sys/atomic.h> 90#include <sys/atomic.h>
91 91
92#include <uvm/uvm_extern.h> 
93 
94#ifdef GPROF 92#ifdef GPROF
95#include <sys/gmon.h> 93#include <sys/gmon.h>
96#endif 94#endif
97 95
98/* 96/*
99 * Clock handling routines. 97 * Clock handling routines.
100 * 98 *
101 * This code is written to operate with two timers that run independently of 99 * This code is written to operate with two timers that run independently of
102 * each other. The main clock, running hz times per second, is used to keep 100 * each other. The main clock, running hz times per second, is used to keep
103 * track of real time. The second timer handles kernel and user profiling, 101 * track of real time. The second timer handles kernel and user profiling,
104 * and does resource use estimation. If the second timer is programmable, 102 * and does resource use estimation. If the second timer is programmable,
105 * it is randomized to avoid aliasing between the two clocks. For example, 103 * it is randomized to avoid aliasing between the two clocks. For example,
106 * the randomization prevents an adversary from always giving up the CPU 104 * the randomization prevents an adversary from always giving up the CPU
cvs diff -r1.29 -r1.30 src/sys/kern/kern_condvar.c (expand / switch to unified diff)

--- src/sys/kern/kern_condvar.c 2011/04/14 20:19:35 1.29
+++ src/sys/kern/kern_condvar.c 2011/07/27 14:35:33 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: kern_condvar.c,v 1.29 2011/04/14 20:19:35 jym Exp $ */ 1/* $NetBSD: kern_condvar.c,v 1.30 2011/07/27 14:35:33 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.
@@ -24,39 +24,37 @@ @@ -24,39 +24,37 @@
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32/* 32/*
33 * Kernel condition variable implementation. 33 * Kernel condition variable implementation.
34 */ 34 */
35 35
36#include <sys/cdefs.h> 36#include <sys/cdefs.h>
37__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.29 2011/04/14 20:19:35 jym Exp $"); 37__KERNEL_RCSID(0, "$NetBSD: kern_condvar.c,v 1.30 2011/07/27 14:35:33 uebayasi Exp $");
38 38
39#include <sys/param.h> 39#include <sys/param.h>
40#include <sys/proc.h> 40#include <sys/proc.h>
41#include <sys/sched.h> 41#include <sys/sched.h>
42#include <sys/systm.h> 42#include <sys/systm.h>
43#include <sys/condvar.h> 43#include <sys/condvar.h>
44#include <sys/sleepq.h> 44#include <sys/sleepq.h>
45#include <sys/lockdebug.h> 45#include <sys/lockdebug.h>
46#include <sys/cpu.h> 46#include <sys/cpu.h>
47 47
48#include <uvm/uvm_extern.h> 
49 
50/* 48/*
51 * Accessors for the private contents of the kcondvar_t data type. 49 * Accessors for the private contents of the kcondvar_t data type.
52 * 50 *
53 * cv_opaque[0] sleepq... 51 * cv_opaque[0] sleepq...
54 * cv_opaque[1] ...pointers 52 * cv_opaque[1] ...pointers
55 * cv_opaque[2] description for ps(1) 53 * cv_opaque[2] description for ps(1)
56 * 54 *
57 * cv_opaque[0..1] is protected by the interlock passed to cv_wait() (enqueue 55 * cv_opaque[0..1] is protected by the interlock passed to cv_wait() (enqueue
58 * only), and the sleep queue lock acquired with sleeptab_lookup() (enqueue 56 * only), and the sleep queue lock acquired with sleeptab_lookup() (enqueue
59 * and dequeue). 57 * and dequeue).
60 * 58 *
61 * cv_opaque[2] (the wmesg) is static and does not change throughout the life 59 * cv_opaque[2] (the wmesg) is static and does not change throughout the life
62 * of the CV. 60 * of the CV.
cvs diff -r1.29 -r1.30 src/sys/kern/kern_turnstile.c (expand / switch to unified diff)

--- src/sys/kern/kern_turnstile.c 2011/05/13 22:19:41 1.29
+++ src/sys/kern/kern_turnstile.c 2011/07/27 14:35:34 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: kern_turnstile.c,v 1.29 2011/05/13 22:19:41 rmind Exp $ */ 1/* $NetBSD: kern_turnstile.c,v 1.30 2011/07/27 14:35:34 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2002, 2006, 2007, 2009 The NetBSD Foundation, Inc. 4 * Copyright (c) 2002, 2006, 2007, 2009 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 Jason R. Thorpe and Andrew Doran. 8 * by Jason R. Thorpe and 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.
@@ -50,37 +50,35 @@ @@ -50,37 +50,35 @@
50 * queue. If a thread decides it doesn't need to block after all, then this 50 * queue. If a thread decides it doesn't need to block after all, then this
51 * interlock must be released by explicitly aborting the turnstile 51 * interlock must be released by explicitly aborting the turnstile
52 * operation. 52 * operation.
53 * 53 *
54 * When a thread is awakened, it needs to get its turnstile back. If there 54 * When a thread is awakened, it needs to get its turnstile back. If there
55 * are still other threads waiting in the active turnstile, the thread 55 * are still other threads waiting in the active turnstile, the thread
56 * grabs a free turnstile off the free list. Otherwise, it can take back 56 * grabs a free turnstile off the free list. Otherwise, it can take back
57 * the active turnstile from the lock (thus deactivating the turnstile). 57 * the active turnstile from the lock (thus deactivating the turnstile).
58 * 58 *
59 * Turnstiles are the place to do priority inheritence. 59 * Turnstiles are the place to do priority inheritence.
60 */ 60 */
61 61
62#include <sys/cdefs.h> 62#include <sys/cdefs.h>
63__KERNEL_RCSID(0, "$NetBSD: kern_turnstile.c,v 1.29 2011/05/13 22:19:41 rmind Exp $"); 63__KERNEL_RCSID(0, "$NetBSD: kern_turnstile.c,v 1.30 2011/07/27 14:35:34 uebayasi Exp $");
64 64
65#include <sys/param.h> 65#include <sys/param.h>
66#include <sys/lockdebug.h> 66#include <sys/lockdebug.h>
67#include <sys/pool.h> 67#include <sys/pool.h>
68#include <sys/proc.h>  68#include <sys/proc.h>
69#include <sys/sleepq.h> 69#include <sys/sleepq.h>
70#include <sys/systm.h> 70#include <sys/systm.h>
71 71
72#include <uvm/uvm_extern.h> 
73 
74#define TS_HASH_SIZE 64 72#define TS_HASH_SIZE 64
75#define TS_HASH_MASK (TS_HASH_SIZE - 1) 73#define TS_HASH_MASK (TS_HASH_SIZE - 1)
76#define TS_HASH(obj) (((uintptr_t)(obj) >> 3) & TS_HASH_MASK) 74#define TS_HASH(obj) (((uintptr_t)(obj) >> 3) & TS_HASH_MASK)
77 75
78static tschain_t turnstile_tab[TS_HASH_SIZE] __cacheline_aligned; 76static tschain_t turnstile_tab[TS_HASH_SIZE] __cacheline_aligned;
79pool_cache_t turnstile_cache __read_mostly; 77pool_cache_t turnstile_cache __read_mostly;
80 78
81static int turnstile_ctor(void *, void *, int); 79static int turnstile_ctor(void *, void *, int);
82 80
83extern turnstile_t turnstile0; 81extern turnstile_t turnstile0;
84 82
85/* 83/*
86 * turnstile_init: 84 * turnstile_init:
cvs diff -r1.63 -r1.64 src/sys/kern/kern_ksyms.c (expand / switch to unified diff)

--- src/sys/kern/kern_ksyms.c 2011/04/24 18:46:22 1.63
+++ src/sys/kern/kern_ksyms.c 2011/07/27 14:35:34 1.64
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: kern_ksyms.c,v 1.63 2011/04/24 18:46:22 rmind Exp $ */ 1/* $NetBSD: kern_ksyms.c,v 1.64 2011/07/27 14:35:34 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2008 The NetBSD Foundation, Inc. 4 * Copyright (c) 2008 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software developed for The NetBSD Foundation 7 * This code is derived from software developed for 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.
@@ -61,48 +61,46 @@ @@ -61,48 +61,46 @@
61 * 61 *
62 * For each loaded module the symbol table info is kept track of by a 62 * For each loaded module the symbol table info is kept track of by a
63 * struct, placed in a circular list. The first entry is the kernel 63 * struct, placed in a circular list. The first entry is the kernel
64 * symbol table. 64 * symbol table.
65 */ 65 */
66 66
67/* 67/*
68 * TODO: 68 * TODO:
69 * 69 *
70 * Add support for mmap, poll. 70 * Add support for mmap, poll.
71 */ 71 */
72 72
73#include <sys/cdefs.h> 73#include <sys/cdefs.h>
74__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.63 2011/04/24 18:46:22 rmind Exp $"); 74__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.64 2011/07/27 14:35:34 uebayasi Exp $");
75 75
76#if defined(_KERNEL) && defined(_KERNEL_OPT) 76#if defined(_KERNEL) && defined(_KERNEL_OPT)
77#include "opt_ddb.h" 77#include "opt_ddb.h"
78#include "opt_ddbparam.h" /* for SYMTAB_SPACE */ 78#include "opt_ddbparam.h" /* for SYMTAB_SPACE */
79#include "opt_dtrace.h" 79#include "opt_dtrace.h"
80#endif 80#endif
81 81
82#define _KSYMS_PRIVATE 82#define _KSYMS_PRIVATE
83 83
84#include <sys/param.h> 84#include <sys/param.h>
85#include <sys/queue.h> 85#include <sys/queue.h>
86#include <sys/exec.h> 86#include <sys/exec.h>
87#include <sys/systm.h> 87#include <sys/systm.h>
88#include <sys/conf.h> 88#include <sys/conf.h>
89#include <sys/kmem.h> 89#include <sys/kmem.h>
90#include <sys/proc.h> 90#include <sys/proc.h>
91#include <sys/atomic.h> 91#include <sys/atomic.h>
92#include <sys/ksyms.h> 92#include <sys/ksyms.h>
93 93
94#include <uvm/uvm_extern.h> 
95 
96#ifdef DDB 94#ifdef DDB
97#include <ddb/db_output.h> 95#include <ddb/db_output.h>
98#endif 96#endif
99 97
100#include "ksyms.h" 98#include "ksyms.h"
101 99
102#define KSYMS_MAX_ID 65536 100#define KSYMS_MAX_ID 65536
103#ifdef KDTRACE_HOOKS 101#ifdef KDTRACE_HOOKS
104static uint32_t ksyms_nmap[KSYMS_MAX_ID]; /* sorted symbol table map */ 102static uint32_t ksyms_nmap[KSYMS_MAX_ID]; /* sorted symbol table map */
105#else 103#else
106static uint32_t *ksyms_nmap = NULL; 104static uint32_t *ksyms_nmap = NULL;
107#endif 105#endif
108 106
cvs diff -r1.40 -r1.41 src/sys/kern/kern_sleepq.c (expand / switch to unified diff)

--- src/sys/kern/kern_sleepq.c 2011/07/26 13:04:51 1.40
+++ src/sys/kern/kern_sleepq.c 2011/07/27 14:35:34 1.41
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: kern_sleepq.c,v 1.40 2011/07/26 13:04:51 yamt Exp $ */ 1/* $NetBSD: kern_sleepq.c,v 1.41 2011/07/27 14:35:34 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2006, 2007, 2008, 2009 The NetBSD Foundation, Inc. 4 * Copyright (c) 2006, 2007, 2008, 2009 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.
@@ -25,43 +25,41 @@ @@ -25,43 +25,41 @@
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32/* 32/*
33 * Sleep queue implementation, used by turnstiles and general sleep/wakeup 33 * Sleep queue implementation, used by turnstiles and general sleep/wakeup
34 * interfaces. 34 * interfaces.
35 */ 35 */
36 36
37#include <sys/cdefs.h> 37#include <sys/cdefs.h>
38__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.40 2011/07/26 13:04:51 yamt Exp $"); 38__KERNEL_RCSID(0, "$NetBSD: kern_sleepq.c,v 1.41 2011/07/27 14:35:34 uebayasi Exp $");
39 39
40#include <sys/param.h> 40#include <sys/param.h>
41#include <sys/kernel.h> 41#include <sys/kernel.h>
42#include <sys/cpu.h> 42#include <sys/cpu.h>
43#include <sys/pool.h> 43#include <sys/pool.h>
44#include <sys/proc.h>  44#include <sys/proc.h>
45#include <sys/resourcevar.h> 45#include <sys/resourcevar.h>
46#include <sys/sa.h> 46#include <sys/sa.h>
47#include <sys/savar.h> 47#include <sys/savar.h>
48#include <sys/sched.h> 48#include <sys/sched.h>
49#include <sys/systm.h> 49#include <sys/systm.h>
50#include <sys/sleepq.h> 50#include <sys/sleepq.h>
51#include <sys/ktrace.h> 51#include <sys/ktrace.h>
52 52
53#include <uvm/uvm_extern.h> 
54 
55#include "opt_sa.h" 53#include "opt_sa.h"
56 54
57static int sleepq_sigtoerror(lwp_t *, int); 55static int sleepq_sigtoerror(lwp_t *, int);
58 56
59/* General purpose sleep table, used by ltsleep() and condition variables. */ 57/* General purpose sleep table, used by ltsleep() and condition variables. */
60sleeptab_t sleeptab __cacheline_aligned; 58sleeptab_t sleeptab __cacheline_aligned;
61 59
62/* 60/*
63 * sleeptab_init: 61 * sleeptab_init:
64 * 62 *
65 * Initialize a sleep table. 63 * Initialize a sleep table.
66 */ 64 */
67void 65void
cvs diff -r1.208 -r1.209 src/sys/kern/kern_subr.c (expand / switch to unified diff)

--- src/sys/kern/kern_subr.c 2010/11/11 11:07:07 1.208
+++ src/sys/kern/kern_subr.c 2011/07/27 14:35:34 1.209
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: kern_subr.c,v 1.208 2010/11/11 11:07:07 hannken Exp $ */ 1/* $NetBSD: kern_subr.c,v 1.209 2011/07/27 14:35:34 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc. 4 * Copyright (c) 1997, 1998, 1999, 2002, 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 Jason R. Thorpe of the Numerical Aerospace Simulation Facility, 8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
9 * NASA Ames Research Center, and by Luke Mewburn. 9 * NASA Ames Research Center, and by Luke Mewburn.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -69,55 +69,53 @@ @@ -69,55 +69,53 @@
69 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 69 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
70 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 70 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
71 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 71 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
72 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 72 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
73 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 73 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
74 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 74 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
75 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 75 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
76 * SUCH DAMAGE. 76 * SUCH DAMAGE.
77 * 77 *
78 * @(#)kern_subr.c 8.4 (Berkeley) 2/14/95 78 * @(#)kern_subr.c 8.4 (Berkeley) 2/14/95
79 */ 79 */
80 80
81#include <sys/cdefs.h> 81#include <sys/cdefs.h>
82__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.208 2010/11/11 11:07:07 hannken Exp $"); 82__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.209 2011/07/27 14:35:34 uebayasi Exp $");
83 83
84#include "opt_ddb.h" 84#include "opt_ddb.h"
85#include "opt_md.h" 85#include "opt_md.h"
86#include "opt_syscall_debug.h" 86#include "opt_syscall_debug.h"
87#include "opt_ktrace.h" 87#include "opt_ktrace.h"
88#include "opt_ptrace.h" 88#include "opt_ptrace.h"
89#include "opt_tftproot.h" 89#include "opt_tftproot.h"
90 90
91#include <sys/param.h> 91#include <sys/param.h>
92#include <sys/systm.h> 92#include <sys/systm.h>
93#include <sys/proc.h> 93#include <sys/proc.h>
94#include <sys/mount.h> 94#include <sys/mount.h>
95#include <sys/device.h> 95#include <sys/device.h>
96#include <sys/reboot.h> 96#include <sys/reboot.h>
97#include <sys/conf.h> 97#include <sys/conf.h>
98#include <sys/disk.h> 98#include <sys/disk.h>
99#include <sys/disklabel.h> 99#include <sys/disklabel.h>
100#include <sys/queue.h> 100#include <sys/queue.h>
101#include <sys/ktrace.h> 101#include <sys/ktrace.h>
102#include <sys/ptrace.h> 102#include <sys/ptrace.h>
103#include <sys/fcntl.h> 103#include <sys/fcntl.h>
104#include <sys/kauth.h> 104#include <sys/kauth.h>
105#include <sys/stat.h> 105#include <sys/stat.h>
106#include <sys/vnode.h> 106#include <sys/vnode.h>
107#include <sys/module.h> 107#include <sys/module.h>
108 108
109#include <uvm/uvm_extern.h> 
110 
111#include <dev/cons.h> 109#include <dev/cons.h>
112 110
113#include <net/if.h> 111#include <net/if.h>
114 112
115/* XXX these should eventually move to subr_autoconf.c */ 113/* XXX these should eventually move to subr_autoconf.c */
116static device_t finddevice(const char *); 114static device_t finddevice(const char *);
117static device_t getdisk(char *, int, int, dev_t *, int); 115static device_t getdisk(char *, int, int, dev_t *, int);
118static device_t parsedisk(char *, int, int, dev_t *); 116static device_t parsedisk(char *, int, int, dev_t *);
119static const char *getwedgename(const char *, int); 117static const char *getwedgename(const char *, int);
120 118
121#ifdef TFTPROOT 119#ifdef TFTPROOT
122int tftproot_dhcpboot(device_t); 120int tftproot_dhcpboot(device_t);
123#endif 121#endif
cvs diff -r1.168 -r1.169 src/sys/kern/kern_time.c (expand / switch to unified diff)

--- src/sys/kern/kern_time.c 2011/04/08 10:35:37 1.168
+++ src/sys/kern/kern_time.c 2011/07/27 14:35:34 1.169
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: kern_time.c,v 1.168 2011/04/08 10:35:37 yamt Exp $ */ 1/* $NetBSD: kern_time.c,v 1.169 2011/07/27 14:35:34 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc. 4 * Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 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 Christopher G. Demetriou, and by Andrew Doran. 8 * by Christopher G. Demetriou, and 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.
@@ -51,47 +51,45 @@ @@ -51,47 +51,45 @@
51 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 51 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
52 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 52 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
53 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 53 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
54 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 54 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
55 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 55 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 * SUCH DAMAGE. 58 * SUCH DAMAGE.
59 * 59 *
60 * @(#)kern_time.c 8.4 (Berkeley) 5/26/95 60 * @(#)kern_time.c 8.4 (Berkeley) 5/26/95
61 */ 61 */
62 62
63#include <sys/cdefs.h> 63#include <sys/cdefs.h>
64__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.168 2011/04/08 10:35:37 yamt Exp $"); 64__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.169 2011/07/27 14:35:34 uebayasi Exp $");
65 65
66#include <sys/param.h> 66#include <sys/param.h>
67#include <sys/resourcevar.h> 67#include <sys/resourcevar.h>
68#include <sys/kernel.h> 68#include <sys/kernel.h>
69#include <sys/systm.h> 69#include <sys/systm.h>
70#include <sys/proc.h> 70#include <sys/proc.h>
71#include <sys/vnode.h> 71#include <sys/vnode.h>
72#include <sys/signalvar.h> 72#include <sys/signalvar.h>
73#include <sys/syslog.h> 73#include <sys/syslog.h>
74#include <sys/timetc.h> 74#include <sys/timetc.h>
75#include <sys/timex.h> 75#include <sys/timex.h>
76#include <sys/kauth.h> 76#include <sys/kauth.h>
77#include <sys/mount.h> 77#include <sys/mount.h>
78#include <sys/sa.h> 78#include <sys/sa.h>
79#include <sys/savar.h> 79#include <sys/savar.h>
80#include <sys/syscallargs.h> 80#include <sys/syscallargs.h>
81#include <sys/cpu.h> 81#include <sys/cpu.h>
82 82
83#include <uvm/uvm_extern.h> 
84 
85#include "opt_sa.h" 83#include "opt_sa.h"
86 84
87static void timer_intr(void *); 85static void timer_intr(void *);
88static void itimerfire(struct ptimer *); 86static void itimerfire(struct ptimer *);
89static void itimerfree(struct ptimers *, int); 87static void itimerfree(struct ptimers *, int);
90 88
91kmutex_t timer_lock; 89kmutex_t timer_lock;
92 90
93static void *timer_sih; 91static void *timer_sih;
94static TAILQ_HEAD(, ptimer) timer_queue; 92static TAILQ_HEAD(, ptimer) timer_queue;
95 93
96struct pool ptimer_pool, ptimers_pool; 94struct pool ptimer_pool, ptimers_pool;
97 95
cvs diff -r1.26 -r1.27 src/sys/kern/sched_4bsd.c (expand / switch to unified diff)

--- src/sys/kern/sched_4bsd.c 2011/04/14 16:19:35 1.26
+++ src/sys/kern/sched_4bsd.c 2011/07/27 14:35:34 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: sched_4bsd.c,v 1.26 2011/04/14 16:19:35 yamt Exp $ */ 1/* $NetBSD: sched_4bsd.c,v 1.27 2011/07/27 14:35:34 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc. 4 * Copyright (c) 1999, 2000, 2004, 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 Jason R. Thorpe of the Numerical Aerospace Simulation Facility, 8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
9 * NASA Ames Research Center, by Charles M. Hannum, Andrew Doran, and 9 * NASA Ames Research Center, by Charles M. Hannum, Andrew Doran, and
10 * Daniel Sieger. 10 * Daniel Sieger.
11 * 11 *
12 * Redistribution and use in source and binary forms, with or without 12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions 13 * modification, are permitted provided that the following conditions
14 * are met: 14 * are met:
@@ -58,49 +58,47 @@ @@ -58,49 +58,47 @@
58 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 58 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
59 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 59 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
60 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 60 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
61 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 61 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
62 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 62 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
63 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 63 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
64 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 64 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
65 * SUCH DAMAGE. 65 * SUCH DAMAGE.
66 * 66 *
67 * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95 67 * @(#)kern_synch.c 8.9 (Berkeley) 5/19/95
68 */ 68 */
69 69
70#include <sys/cdefs.h> 70#include <sys/cdefs.h>
71__KERNEL_RCSID(0, "$NetBSD: sched_4bsd.c,v 1.26 2011/04/14 16:19:35 yamt Exp $"); 71__KERNEL_RCSID(0, "$NetBSD: sched_4bsd.c,v 1.27 2011/07/27 14:35:34 uebayasi Exp $");
72 72
73#include "opt_ddb.h" 73#include "opt_ddb.h"
74#include "opt_lockdebug.h" 74#include "opt_lockdebug.h"
75#include "opt_perfctrs.h" 75#include "opt_perfctrs.h"
76 76
77#include <sys/param.h> 77#include <sys/param.h>
78#include <sys/systm.h> 78#include <sys/systm.h>
79#include <sys/callout.h> 79#include <sys/callout.h>
80#include <sys/cpu.h> 80#include <sys/cpu.h>
81#include <sys/proc.h> 81#include <sys/proc.h>
82#include <sys/kernel.h> 82#include <sys/kernel.h>
83#include <sys/signalvar.h> 83#include <sys/signalvar.h>
84#include <sys/resourcevar.h> 84#include <sys/resourcevar.h>
85#include <sys/sched.h> 85#include <sys/sched.h>
86#include <sys/sysctl.h> 86#include <sys/sysctl.h>
87#include <sys/kauth.h> 87#include <sys/kauth.h>
88#include <sys/lockdebug.h> 88#include <sys/lockdebug.h>
89#include <sys/kmem.h> 89#include <sys/kmem.h>
90#include <sys/intr.h> 90#include <sys/intr.h>
91 91
92#include <uvm/uvm_extern.h> 
93 
94static void updatepri(struct lwp *); 92static void updatepri(struct lwp *);
95static void resetpriority(struct lwp *); 93static void resetpriority(struct lwp *);
96 94
97extern unsigned int sched_pstats_ticks; /* defined in kern_synch.c */ 95extern unsigned int sched_pstats_ticks; /* defined in kern_synch.c */
98 96
99/* Number of hardclock ticks per sched_tick() */ 97/* Number of hardclock ticks per sched_tick() */
100static int rrticks; 98static int rrticks;
101 99
102/* 100/*
103 * Force switch among equal priority processes every 100ms. 101 * Force switch among equal priority processes every 100ms.
104 * Called from hardclock every hz/10 == rrticks hardclock ticks. 102 * Called from hardclock every hz/10 == rrticks hardclock ticks.
105 * 103 *
106 * There's no need to lock anywhere in this routine, as it's 104 * There's no need to lock anywhere in this routine, as it's
cvs diff -r1.13 -r1.14 src/sys/kern/subr_percpu.c (expand / switch to unified diff)

--- src/sys/kern/subr_percpu.c 2011/05/13 22:16:44 1.13
+++ src/sys/kern/subr_percpu.c 2011/07/27 14:35:34 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: subr_percpu.c,v 1.13 2011/05/13 22:16:44 rmind Exp $ */ 1/* $NetBSD: subr_percpu.c,v 1.14 2011/07/27 14:35:34 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c)2007,2008 YAMAMOTO Takashi, 4 * Copyright (c)2007,2008 YAMAMOTO Takashi,
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -21,40 +21,38 @@ @@ -21,40 +21,38 @@
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29/* 29/*
30 * per-cpu storage. 30 * per-cpu storage.
31 */ 31 */
32 32
33#include <sys/cdefs.h> 33#include <sys/cdefs.h>
34__KERNEL_RCSID(0, "$NetBSD: subr_percpu.c,v 1.13 2011/05/13 22:16:44 rmind Exp $"); 34__KERNEL_RCSID(0, "$NetBSD: subr_percpu.c,v 1.14 2011/07/27 14:35:34 uebayasi Exp $");
35 35
36#include <sys/param.h> 36#include <sys/param.h>
37#include <sys/cpu.h> 37#include <sys/cpu.h>
38#include <sys/kmem.h> 38#include <sys/kmem.h>
39#include <sys/kernel.h> 39#include <sys/kernel.h>
40#include <sys/mutex.h> 40#include <sys/mutex.h>
41#include <sys/percpu.h> 41#include <sys/percpu.h>
42#include <sys/rwlock.h> 42#include <sys/rwlock.h>
43#include <sys/vmem.h> 43#include <sys/vmem.h>
44#include <sys/xcall.h> 44#include <sys/xcall.h>
45 45
46#include <uvm/uvm_extern.h> 
47 
48#define PERCPU_QUANTUM_SIZE (ALIGNBYTES + 1) 46#define PERCPU_QUANTUM_SIZE (ALIGNBYTES + 1)
49#define PERCPU_QCACHE_MAX 0 47#define PERCPU_QCACHE_MAX 0
50#define PERCPU_IMPORT_SIZE 2048 48#define PERCPU_IMPORT_SIZE 2048
51 49
52#if defined(DIAGNOSTIC) 50#if defined(DIAGNOSTIC)
53#define MAGIC 0x50435055 /* "PCPU" */ 51#define MAGIC 0x50435055 /* "PCPU" */
54#define percpu_encrypt(pc) ((pc) ^ MAGIC) 52#define percpu_encrypt(pc) ((pc) ^ MAGIC)
55#define percpu_decrypt(pc) ((pc) ^ MAGIC) 53#define percpu_decrypt(pc) ((pc) ^ MAGIC)
56#else /* defined(DIAGNOSTIC) */ 54#else /* defined(DIAGNOSTIC) */
57#define percpu_encrypt(pc) (pc) 55#define percpu_encrypt(pc) (pc)
58#define percpu_decrypt(pc) (pc) 56#define percpu_decrypt(pc) (pc)
59#endif /* defined(DIAGNOSTIC) */ 57#endif /* defined(DIAGNOSTIC) */
60 58
cvs diff -r1.30 -r1.31 src/sys/kern/subr_workqueue.c (expand / switch to unified diff)

--- src/sys/kern/subr_workqueue.c 2009/11/11 14:54:40 1.30
+++ src/sys/kern/subr_workqueue.c 2011/07/27 14:35:34 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: subr_workqueue.c,v 1.30 2009/11/11 14:54:40 rmind Exp $ */ 1/* $NetBSD: subr_workqueue.c,v 1.31 2011/07/27 14:35:34 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c)2002, 2005, 2006, 2007 YAMAMOTO Takashi, 4 * Copyright (c)2002, 2005, 2006, 2007 YAMAMOTO Takashi,
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -17,41 +17,39 @@ @@ -17,41 +17,39 @@
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: subr_workqueue.c,v 1.30 2009/11/11 14:54:40 rmind Exp $"); 30__KERNEL_RCSID(0, "$NetBSD: subr_workqueue.c,v 1.31 2011/07/27 14:35:34 uebayasi Exp $");
31 31
32#include <sys/param.h> 32#include <sys/param.h>
33#include <sys/cpu.h> 33#include <sys/cpu.h>
34#include <sys/systm.h> 34#include <sys/systm.h>
35#include <sys/kthread.h> 35#include <sys/kthread.h>
36#include <sys/kmem.h> 36#include <sys/kmem.h>
37#include <sys/proc.h> 37#include <sys/proc.h>
38#include <sys/workqueue.h> 38#include <sys/workqueue.h>
39#include <sys/mutex.h> 39#include <sys/mutex.h>
40#include <sys/condvar.h> 40#include <sys/condvar.h>
41#include <sys/queue.h> 41#include <sys/queue.h>
42 42
43#include <uvm/uvm_extern.h> 
44 
45typedef struct work_impl { 43typedef struct work_impl {
46 SIMPLEQ_ENTRY(work_impl) wk_entry; 44 SIMPLEQ_ENTRY(work_impl) wk_entry;
47} work_impl_t; 45} work_impl_t;
48 46
49SIMPLEQ_HEAD(workqhead, work_impl); 47SIMPLEQ_HEAD(workqhead, work_impl);
50 48
51struct workqueue_queue { 49struct workqueue_queue {
52 kmutex_t q_mutex; 50 kmutex_t q_mutex;
53 kcondvar_t q_cv; 51 kcondvar_t q_cv;
54 struct workqhead q_queue; 52 struct workqhead q_queue;
55 lwp_t *q_worker; 53 lwp_t *q_worker;
56}; 54};
57 55
cvs diff -r1.126 -r1.127 src/sys/kern/sys_generic.c (expand / switch to unified diff)

--- src/sys/kern/sys_generic.c 2011/04/10 15:45:33 1.126
+++ src/sys/kern/sys_generic.c 2011/07/27 14:35:34 1.127
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: sys_generic.c,v 1.126 2011/04/10 15:45:33 christos Exp $ */ 1/* $NetBSD: sys_generic.c,v 1.127 2011/07/27 14:35:34 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc. 4 * Copyright (c) 2007, 2008, 2009 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,50 +60,48 @@ @@ -60,50 +60,48 @@
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 * @(#)sys_generic.c 8.9 (Berkeley) 2/14/95 65 * @(#)sys_generic.c 8.9 (Berkeley) 2/14/95
66 */ 66 */
67 67
68/* 68/*
69 * System calls relating to files. 69 * System calls relating to files.
70 */ 70 */
71 71
72#include <sys/cdefs.h> 72#include <sys/cdefs.h>
73__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.126 2011/04/10 15:45:33 christos Exp $"); 73__KERNEL_RCSID(0, "$NetBSD: sys_generic.c,v 1.127 2011/07/27 14:35:34 uebayasi Exp $");
74 74
75#include <sys/param.h> 75#include <sys/param.h>
76#include <sys/systm.h> 76#include <sys/systm.h>
77#include <sys/filedesc.h> 77#include <sys/filedesc.h>
78#include <sys/ioctl.h> 78#include <sys/ioctl.h>
79#include <sys/file.h> 79#include <sys/file.h>
80#include <sys/proc.h> 80#include <sys/proc.h>
81#include <sys/socketvar.h> 81#include <sys/socketvar.h>
82#include <sys/signalvar.h> 82#include <sys/signalvar.h>
83#include <sys/uio.h> 83#include <sys/uio.h>
84#include <sys/kernel.h> 84#include <sys/kernel.h>
85#include <sys/stat.h> 85#include <sys/stat.h>
86#include <sys/kmem.h> 86#include <sys/kmem.h>
87#include <sys/poll.h> 87#include <sys/poll.h>
88#include <sys/vnode.h> 88#include <sys/vnode.h>
89#include <sys/mount.h> 89#include <sys/mount.h>
90#include <sys/syscallargs.h> 90#include <sys/syscallargs.h>
91#include <sys/ktrace.h> 91#include <sys/ktrace.h>
92#include <sys/atomic.h> 92#include <sys/atomic.h>
93#include <sys/disklabel.h> 93#include <sys/disklabel.h>
94 94
95#include <uvm/uvm_extern.h> 
96 
97/* 95/*
98 * Read system call. 96 * Read system call.
99 */ 97 */
100/* ARGSUSED */ 98/* ARGSUSED */
101int 99int
102sys_read(struct lwp *l, const struct sys_read_args *uap, register_t *retval) 100sys_read(struct lwp *l, const struct sys_read_args *uap, register_t *retval)
103{ 101{
104 /* { 102 /* {
105 syscallarg(int) fd; 103 syscallarg(int) fd;
106 syscallarg(void *) buf; 104 syscallarg(void *) buf;
107 syscallarg(size_t) nbyte; 105 syscallarg(size_t) nbyte;
108 } */ 106 } */
109 file_t *fp; 107 file_t *fp;
cvs diff -r1.140 -r1.141 src/sys/kern/uipc_mbuf.c (expand / switch to unified diff)

--- src/sys/kern/uipc_mbuf.c 2011/04/24 18:46:23 1.140
+++ src/sys/kern/uipc_mbuf.c 2011/07/27 14:35:34 1.141
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: uipc_mbuf.c,v 1.140 2011/04/24 18:46:23 rmind Exp $ */ 1/* $NetBSD: uipc_mbuf.c,v 1.141 2011/07/27 14:35:34 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc. 4 * Copyright (c) 1999, 2001 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 Jason R. Thorpe of the Numerical Aerospace Simulation Facility, 8 * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
9 * NASA Ames Research Center. 9 * NASA Ames Research Center.
10 * 10 *
11 * Redistribution and use in source and binary forms, with or without 11 * Redistribution and use in source and binary forms, with or without
12 * modification, are permitted provided that the following conditions 12 * modification, are permitted provided that the following conditions
13 * are met: 13 * are met:
14 * 1. Redistributions of source code must retain the above copyright 14 * 1. Redistributions of source code must retain the above copyright
@@ -52,52 +52,50 @@ @@ -52,52 +52,50 @@
52 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 52 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
53 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 53 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
54 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 54 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 55 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 56 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 57 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 58 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
59 * SUCH DAMAGE. 59 * SUCH DAMAGE.
60 * 60 *
61 * @(#)uipc_mbuf.c 8.4 (Berkeley) 2/14/95 61 * @(#)uipc_mbuf.c 8.4 (Berkeley) 2/14/95
62 */ 62 */
63 63
64#include <sys/cdefs.h> 64#include <sys/cdefs.h>
65__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.140 2011/04/24 18:46:23 rmind Exp $"); 65__KERNEL_RCSID(0, "$NetBSD: uipc_mbuf.c,v 1.141 2011/07/27 14:35:34 uebayasi Exp $");
66 66
67#include "opt_mbuftrace.h" 67#include "opt_mbuftrace.h"
68#include "opt_nmbclusters.h" 68#include "opt_nmbclusters.h"
69#include "opt_ddb.h" 69#include "opt_ddb.h"
70 70
71#include <sys/param.h> 71#include <sys/param.h>
72#include <sys/systm.h> 72#include <sys/systm.h>
73#include <sys/atomic.h> 73#include <sys/atomic.h>
74#include <sys/cpu.h> 74#include <sys/cpu.h>
75#include <sys/proc.h> 75#include <sys/proc.h>
76#define MBTYPES 76#define MBTYPES
77#include <sys/mbuf.h> 77#include <sys/mbuf.h>
78#include <sys/kernel.h> 78#include <sys/kernel.h>
79#include <sys/syslog.h> 79#include <sys/syslog.h>
80#include <sys/domain.h> 80#include <sys/domain.h>
81#include <sys/protosw.h> 81#include <sys/protosw.h>
82#include <sys/percpu.h> 82#include <sys/percpu.h>
83#include <sys/pool.h> 83#include <sys/pool.h>
84#include <sys/socket.h> 84#include <sys/socket.h>
85#include <sys/sysctl.h> 85#include <sys/sysctl.h>
86 86
87#include <net/if.h> 87#include <net/if.h>
88 88
89#include <uvm/uvm_extern.h> 
90 
91pool_cache_t mb_cache; /* mbuf cache */ 89pool_cache_t mb_cache; /* mbuf cache */
92pool_cache_t mcl_cache; /* mbuf cluster cache */ 90pool_cache_t mcl_cache; /* mbuf cluster cache */
93 91
94struct mbstat mbstat; 92struct mbstat mbstat;
95int max_linkhdr; 93int max_linkhdr;
96int max_protohdr; 94int max_protohdr;
97int max_hdr; 95int max_hdr;
98int max_datalen; 96int max_datalen;
99 97
100static int mb_ctor(void *, void *, int); 98static int mb_ctor(void *, void *, int);
101 99
102static void sysctl_kern_mbuf_setup(void); 100static void sysctl_kern_mbuf_setup(void);
103 101
cvs diff -r1.145 -r1.146 src/sys/kern/uipc_syscalls.c (expand / switch to unified diff)

--- src/sys/kern/uipc_syscalls.c 2011/07/15 14:50:19 1.145
+++ src/sys/kern/uipc_syscalls.c 2011/07/27 14:35:34 1.146
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: uipc_syscalls.c,v 1.145 2011/07/15 14:50:19 christos Exp $ */ 1/* $NetBSD: uipc_syscalls.c,v 1.146 2011/07/27 14:35:34 uebayasi Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. 4 * Copyright (c) 2008, 2009 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.
@@ -51,51 +51,49 @@ @@ -51,51 +51,49 @@
51 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE 51 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
52 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 52 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
53 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 53 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
54 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 54 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
55 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 55 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 56 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 57 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
58 * SUCH DAMAGE. 58 * SUCH DAMAGE.
59 * 59 *
60 * @(#)uipc_syscalls.c 8.6 (Berkeley) 2/14/95 60 * @(#)uipc_syscalls.c 8.6 (Berkeley) 2/14/95
61 */ 61 */
62 62
63#include <sys/cdefs.h> 63#include <sys/cdefs.h>
64__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.145 2011/07/15 14:50:19 christos Exp $"); 64__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.146 2011/07/27 14:35:34 uebayasi Exp $");
65 65
66#include "opt_pipe.h" 66#include "opt_pipe.h"
67 67
68#include <sys/param.h> 68#include <sys/param.h>
69#include <sys/systm.h> 69#include <sys/systm.h>
70#include <sys/filedesc.h> 70#include <sys/filedesc.h>
71#include <sys/proc.h> 71#include <sys/proc.h>
72#include <sys/file.h> 72#include <sys/file.h>
73#include <sys/buf.h> 73#include <sys/buf.h>
74#include <sys/mbuf.h> 74#include <sys/mbuf.h>
75#include <sys/protosw.h> 75#include <sys/protosw.h>
76#include <sys/socket.h> 76#include <sys/socket.h>
77#include <sys/socketvar.h> 77#include <sys/socketvar.h>
78#include <sys/signalvar.h> 78#include <sys/signalvar.h>
79#include <sys/un.h> 79#include <sys/un.h>
80#include <sys/ktrace.h> 80#include <sys/ktrace.h>
81#include <sys/event.h> 81#include <sys/event.h>
82#include <sys/kauth.h> 82#include <sys/kauth.h>
83 83
84#include <sys/mount.h> 84#include <sys/mount.h>
85#include <sys/syscallargs.h> 85#include <sys/syscallargs.h>
86 86
87#include <uvm/uvm_extern.h> 
88 
89/* 87/*
90 * System call interface to the socket abstraction. 88 * System call interface to the socket abstraction.
91 */ 89 */
92extern const struct fileops socketops; 90extern const struct fileops socketops;
93 91
94int 92int
95sys___socket30(struct lwp *l, const struct sys___socket30_args *uap, register_t *retval) 93sys___socket30(struct lwp *l, const struct sys___socket30_args *uap, register_t *retval)
96{ 94{
97 /* { 95 /* {
98 syscallarg(int) domain; 96 syscallarg(int) domain;
99 syscallarg(int) type; 97 syscallarg(int) type;
100 syscallarg(int) protocol; 98 syscallarg(int) protocol;
101 } */ 99 } */