CVS commit: src/sys/kern

[Paul Goyette]

Module Name:    src
Committed By:   pgoyette
Date:           Mon Sep 19 00:40:23 UTC 2011

Modified Files:
        src/sys/kern: kern_module.c

Log Message:
When "loading" a built-in module needs to autoload a dependant module
which is not already loaded (or was loaded, and then unloaded), make
sure we return a pointer to the built-in module.  Otherwise, when the
initial module tries to update its dependancies' reference counts, we
trigger a KASSERT in module_enqueue().


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/kern/kern_module.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/kern_module.c
diff -u src/sys/kern/kern_module.c:1.81 src/sys/kern/kern_module.c:1.82
--- src/sys/kern/kern_module.c:1.81	Wed Sep 14 12:29:22 2011
+++ src/sys/kern/kern_module.c	Mon Sep 19 00:40:22 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_module.c,v 1.81 2011/09/14 12:29:22 christos Exp $	*/
+/*	$NetBSD: kern_module.c,v 1.82 2011/09/19 00:40:22 pgoyette Exp $	*/
 
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.81 2011/09/14 12:29:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.82 2011/09/19 00:40:22 pgoyette Exp $");
 
 #define _MODULE_INTERNAL
 
@@ -872,7 +872,7 @@
 			depth--;
 			return EPERM;
 		} else {
-			error = module_do_builtin(name, NULL, props);
+			error = module_do_builtin(name, modp, props);
 			depth--;
 			return error;
 		}
@@ -1169,6 +1169,7 @@
 	}
 	module_gen++;
 
+	module_print("unloaded module `%s'", name);
 	return 0;
 }