svn commit: r188515 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb kern

[John Baldwin]

Author: jhb
Date: Thu Feb 12 14:41:23 2009
New Revision: 188515
URL: http://svn.freebsd.org/changeset/base/188515

Log:
  MFC: Drop the kernel linker lock while running SYSUNINIT routines and
  removing sysctls during a linker file unload.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/kern_linker.c

Modified: stable/7/sys/kern/kern_linker.c
==============================================================================
--- stable/7/sys/kern/kern_linker.c	Thu Feb 12 14:37:58 2009	(r188514)
+++ stable/7/sys/kern/kern_linker.c	Thu Feb 12 14:41:23 2009	(r188515)
@@ -642,8 +642,11 @@ linker_file_unload(linker_file_t file, i
 	 * link error.
 	 */
 	if (file->flags & LINKER_FILE_LINKED) {
+		file->flags &= ~LINKER_FILE_LINKED;
+		KLD_UNLOCK();
 		linker_file_sysuninit(file);
 		linker_file_unregister_sysctls(file);
+		KLD_LOCK();
 	}
 	TAILQ_REMOVE(&linker_files, file, link);