svn commit: r199457 - head/sys/kern

[Oleksandr Tymoshenko]

Author: gonzo
Date: Tue Nov 17 21:56:12 2009
New Revision: 199457
URL: http://svn.freebsd.org/changeset/base/199457

Log:
  - Unbreak build with KLD_DEBUG defined
  - Add debug.kld_debug sysctl to control KLD debugging level
  - Print information about KLD dependencies with debug enabled

Modified:
  head/sys/kern/kern_linker.c

Modified: head/sys/kern/kern_linker.c
==============================================================================
--- head/sys/kern/kern_linker.c	Tue Nov 17 21:45:28 2009	(r199456)
+++ head/sys/kern/kern_linker.c	Tue Nov 17 21:56:12 2009	(r199457)
@@ -64,6 +64,8 @@ __FBSDID("$FreeBSD$");
 
 #ifdef KLD_DEBUG
 int kld_debug = 0;
+SYSCTL_INT(_debug, OID_AUTO, kld_debug, CTLFLAG_RW,
+        &kld_debug, 0, "Set various levels of KLD debug");
 #endif
 
 #define	KLD_LOCK()		sx_xlock(&kld_sx)
@@ -632,7 +634,7 @@ linker_file_unload(linker_file_t file, i
 		 */
 		if ((error = module_unload(mod)) != 0) {
 			KLD_DPF(FILE, ("linker_file_unload: module %s"
-			    " failed unload\n", mod));
+			    " failed unload\n", module_getname(mod)));
 			return (error);
 		}
 		MOD_XLOCK;
@@ -709,6 +711,9 @@ linker_file_add_dependency(linker_file_t
 	file->deps = newdeps;
 	file->deps[file->ndeps] = dep;
 	file->ndeps++;
+	KLD_DPF(FILE, ("linker_file_add_dependency:"
+	    " adding %s as dependency for %s\n", 
+	    dep->filename, file->filename));
 	return (0);
 }