Tue Jan 28 16:35:39 2020 UTC ()

Call radix_tree_init() earlier, so more stuff can make use of radixtree.


(ad)

diff -r1.518 -r1.519 src/sys/kern/init_main.c

--- src/sys/kern/init_main.c 2020/01/08 17:38:42	1.518
+++ src/sys/kern/init_main.c 2020/01/28 16:35:39	1.519

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init_main.c,v 1.518 2020/01/08 17:38:42 ad Exp $	*/
+/*	$NetBSD: init_main.c,v 1.519 2020/01/28 16:35:39 ad Exp $	*/
 /*-
  * Copyright (c) 2008, 2009, 2019 The NetBSD Foundation, Inc.
  * 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.
 @@ -87,27 +87,27 @@
  * 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.
+ *
  *	@(#)init_main.c	8.16 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.518 2020/01/08 17:38:42 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.519 2020/01/28 16:35:39 ad Exp $");
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_modular.h"
 #include "opt_ntp.h"
 #include "opt_pipe.h"
 #include "opt_syscall_debug.h"
 #include "opt_sysv.h"
 #include "opt_fileassoc.h"
 #include "opt_ktrace.h"
 #include "opt_pax.h"
 #include "opt_compat_netbsd.h"
 @@ -319,26 +319,29 @@ main(void)
 	prop_kern_init();
 #if ((NKSYMS > 0) || (NDDB > 0) || (NMODULAR > 0))
 	ksyms_init();
 #endif
 	kprintf_init();
 	percpu_init();
 	/* Initialize lock caches. */
 	mutex_obj_init();
 	rw_obj_init();
 	/* Initialize radix trees (used by numerous subsystems). */
 	radix_tree_init();
 	/* Passive serialization. */
 	pserialize_init();
 	/* Initialize the extent manager. */
 	extent_init();
 	/* Do machine-dependent initialization. */
 	cpu_startup();
 	/* Initialize the sysctl subsystem. */
 	sysctl_init();
 	/* Initialize callouts, part 1. */
 @@ -470,27 +473,26 @@ main(void)
 	 * defined in kernel config, adjust the number such as we use roughly
 	 * 10% of memory for vnodes and associated data structures in the
 	 * assumed worst case.  Do not provide fewer than NVNODE vnodes.
 	 */
 	usevnodes = calc_cache_size(vmem_size(kmem_arena, VMEM_FREE|VMEM_ALLOC),
 , VNODE_KMEM_MAXPCT) / VNODE_COST;
 	if (usevnodes > desiredvnodes)
 		desiredvnodes = usevnodes;
 #endif
 	/* Initialize fstrans. */
 	fstrans_init();
 	radix_tree_init(); /* used for page cache */
 	vfsinit();
 	lf_init();
 	/* Initialize the file descriptor system. */
 	fd_sys_init();
 	/* Initialize cwd structures */
 	cwd_sys_init();
 	/* Initialize kqueue. */
 	kqueue_init();
 	inittimecounter();