svn commit: r218277 - in stable/7/sys: kern sys

[John Baldwin]

Author: jhb
Date: Fri Feb  4 14:44:59 2011
New Revision: 218277
URL: http://svn.freebsd.org/changeset/base/218277

Log:
  MFC 217075:
  Retire PCONFIG and leave the priority of thread0 alone when waiting for
  interrupt config hooks to execute.
  
  To preserve the KBI, I did not renumber priorities but simply removed
  PCONFIG.

Modified:
  stable/7/sys/kern/subr_autoconf.c
  stable/7/sys/sys/priority.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/kern/subr_autoconf.c
==============================================================================
--- stable/7/sys/kern/subr_autoconf.c	Fri Feb  4 14:44:42 2011	(r218276)
+++ stable/7/sys/kern/subr_autoconf.c	Fri Feb  4 14:44:59 2011	(r218277)
@@ -108,7 +108,7 @@ run_interrupt_driven_config_hooks(dummy)
 	warned = 0;
 	while (!TAILQ_EMPTY(&intr_config_hook_list)) {
 		if (msleep(&intr_config_hook_list, &intr_config_hook_lock,
-		    PCONFIG, "conifhk", WARNING_INTERVAL_SECS * hz) ==
+		    0, "conifhk", WARNING_INTERVAL_SECS * hz) ==
 		    EWOULDBLOCK) {
 			mtx_unlock(&intr_config_hook_lock);
 			warned++;

Modified: stable/7/sys/sys/priority.h
==============================================================================
--- stable/7/sys/sys/priority.h	Fri Feb  4 14:44:42 2011	(r218276)
+++ stable/7/sys/sys/priority.h	Fri Feb  4 14:44:59 2011	(r218277)
@@ -105,7 +105,6 @@
 #define	PZERO			(PRI_MIN_KERN + 20)
 #define	PSOCK			(PRI_MIN_KERN + 24)
 #define	PWAIT			(PRI_MIN_KERN + 28)
-#define	PCONFIG			(PRI_MIN_KERN + 32)
 #define	PLOCK			(PRI_MIN_KERN + 36)
 #define	PPAUSE			(PRI_MIN_KERN + 40)