Sat Dec 7 14:55:58 2019 UTC ()
Restore call to pserialize_init.

We need it after all for psz_lock on the event counter.


(riastradh)
diff -r1.336 -r1.337 src/sys/rump/librump/rumpkern/rump.c
cvs diff -r1.336 -r1.337 src/sys/rump/librump/rumpkern/rump.c (expand / switch to unified diff)

--- src/sys/rump/librump/rumpkern/rump.c 2019/12/03 05:07:49 1.336
+++ src/sys/rump/librump/rumpkern/rump.c 2019/12/07 14:55:58 1.337
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: rump.c,v 1.336 2019/12/03 05:07:49 riastradh Exp $ */ 1/* $NetBSD: rump.c,v 1.337 2019/12/07 14:55:58 riastradh Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved. 4 * Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the 12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution. 13 * documentation and/or other materials provided with the distribution.
14 * 14 *
@@ -16,27 +16,27 @@ @@ -16,27 +16,27 @@
16 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 16 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 17 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 18 * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 19 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 20 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE. 25 * SUCH DAMAGE.
26 */ 26 */
27 27
28#include <sys/cdefs.h> 28#include <sys/cdefs.h>
29__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.336 2019/12/03 05:07:49 riastradh Exp $"); 29__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.337 2019/12/07 14:55:58 riastradh Exp $");
30 30
31#include <sys/systm.h> 31#include <sys/systm.h>
32#define ELFSIZE ARCH_ELFSIZE 32#define ELFSIZE ARCH_ELFSIZE
33 33
34#include <sys/param.h> 34#include <sys/param.h>
35#include <sys/atomic.h> 35#include <sys/atomic.h>
36#include <sys/buf.h> 36#include <sys/buf.h>
37#include <sys/callout.h> 37#include <sys/callout.h>
38#include <sys/conf.h> 38#include <sys/conf.h>
39#include <sys/cpu.h> 39#include <sys/cpu.h>
40#include <sys/device.h> 40#include <sys/device.h>
41#include <sys/evcnt.h> 41#include <sys/evcnt.h>
42#include <sys/event.h> 42#include <sys/event.h>
@@ -63,26 +63,27 @@ __KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.3 @@ -63,26 +63,27 @@ __KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.3
63#include <sys/select.h> 63#include <sys/select.h>
64#include <sys/sysctl.h> 64#include <sys/sysctl.h>
65#include <sys/syscall.h> 65#include <sys/syscall.h>
66#include <sys/syscallvar.h> 66#include <sys/syscallvar.h>
67#include <sys/threadpool.h> 67#include <sys/threadpool.h>
68#include <sys/timetc.h> 68#include <sys/timetc.h>
69#include <sys/tty.h> 69#include <sys/tty.h>
70#include <sys/uidinfo.h> 70#include <sys/uidinfo.h>
71#include <sys/vmem.h> 71#include <sys/vmem.h>
72#include <sys/xcall.h> 72#include <sys/xcall.h>
73#include <sys/cprng.h> 73#include <sys/cprng.h>
74#include <sys/rnd.h> 74#include <sys/rnd.h>
75#include <sys/ktrace.h> 75#include <sys/ktrace.h>
 76#include <sys/pserialize.h>
76#include <sys/psref.h> 77#include <sys/psref.h>
77 78
78#include <rump-sys/kern.h> 79#include <rump-sys/kern.h>
79#include <rump-sys/dev.h> 80#include <rump-sys/dev.h>
80#include <rump-sys/net.h> 81#include <rump-sys/net.h>
81#include <rump-sys/vfs.h> 82#include <rump-sys/vfs.h>
82 83
83#include <rump/rumpuser.h> 84#include <rump/rumpuser.h>
84 85
85#include <secmodel/suser/suser.h> 86#include <secmodel/suser/suser.h>
86 87
87#include <prop/proplib.h> 88#include <prop/proplib.h>
88 89
@@ -295,26 +296,27 @@ rump_init(void) @@ -295,26 +296,27 @@ rump_init(void)
295 prop_kern_init(); 296 prop_kern_init();
296 297
297 kmem_init(); 298 kmem_init();
298 299
299 uvm_ra_init(); 300 uvm_ra_init();
300 uao_init(); 301 uao_init();
301 302
302 mutex_obj_init(); 303 mutex_obj_init();
303 rw_obj_init(); 304 rw_obj_init();
304 callout_startup(); 305 callout_startup();
305 306
306 kprintf_init(); 307 kprintf_init();
307 percpu_init(); 308 percpu_init();
 309 pserialize_init();
308 310
309 kauth_init(); 311 kauth_init();
310 312
311 secmodel_init(); 313 secmodel_init();
312 sysctl_init(); 314 sysctl_init();
313 /* 315 /*
314 * The above call to sysctl_init() only initializes sysctl nodes 316 * The above call to sysctl_init() only initializes sysctl nodes
315 * from link sets. Initialize sysctls in case we used ctors. 317 * from link sets. Initialize sysctls in case we used ctors.
316 */ 318 */
317#ifdef RUMP_USE_CTOR 319#ifdef RUMP_USE_CTOR
318 { 320 {
319 struct sysctl_setup_chain *ssc; 321 struct sysctl_setup_chain *ssc;
320 322