Module Name: src
Committed By: riz
Date: Tue Dec 21 22:21:42 UTC 2010
Modified Files:
src/sys/kern [netbsd-5]: init_main.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1496):
sys/kern/init_main.c: revision 1.418
fix LOCKDEBUG panic 'uninitialized lock'.
seminit() calls exithook_establish(). exithook_establish() uses the exec_lock.
exec_lock is initialzed by exec_init(1).
Call exec_init(1) before seminit().
To generate a diff of this commit:
cvs rdiff -u -r1.371.2.4 -r1.371.2.5 src/sys/kern/init_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.371.2.4 src/sys/kern/init_main.c:1.371.2.5
--- src/sys/kern/init_main.c:1.371.2.4 Sun Feb 14 13:35:43 2010
+++ src/sys/kern/init_main.c Tue Dec 21 22:21:42 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.371.2.4 2010/02/14 13:35:43 bouyer Exp $ */
+/* $NetBSD: init_main.c,v 1.371.2.5 2010/12/21 22:21:42 riz Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.371.2.4 2010/02/14 13:35:43 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.371.2.5 2010/12/21 22:21:42 riz Exp $");
#include "opt_ddb.h"
#include "opt_ipsec.h"
@@ -477,6 +477,11 @@
shminit();
#endif
+ vmem_rehash_start(); /* must be before exec_init */
+
+ /* Initialize exec structures */
+ exec_init(1); /* seminit calls exithook_establish() */
+
#ifdef SYSVSEM
/* Initialize System V style semaphores. */
seminit();
@@ -661,11 +666,6 @@
uvm_aiodone_worker, NULL, PRI_VM, IPL_NONE, WQ_MPSAFE))
panic("fork aiodoned");
- vmem_rehash_start();
-
- /* Initialize exec structures */
- exec_init(1);
-
/*
* Okay, now we can let init(8) exec! It's off to userland!
*/
