svn commit: r248952 - projects/amd64_xen_pv/sys/xen/xenbus

[Cherry G. Mathew]

Author: cherry
Date: Sun Mar 31 17:50:01 2013
New Revision: 248952
URL: http://svnweb.freebsd.org/changeset/base/248952

Log:
  Do not defer disestablishing intrhooks when there are pending
  connecting device children. Any hooks that children establish will be
  run at SI_SUB_INT_CONFIG_HOOKS and in the order of registration, and
  thus the order of intrhook registration and running should reflect the
  device hierarchy.
  
  This patch takes the boot to vfsmountroot()
  
  Approved by: gibbs(implicit)

Modified:
  projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c

Modified: projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c
==============================================================================
--- projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c	Sun Mar 31 17:42:54 2013	(r248951)
+++ projects/amd64_xen_pv/sys/xen/xenbus/xenbusb.c	Sun Mar 31 17:50:01 2013	(r248952)
@@ -594,8 +594,7 @@ xenbusb_release_confighook(struct xenbus
 	KASSERT(xbs->xbs_connecting_children > 0,
 		("Connecting device count error\n"));
 	xbs->xbs_connecting_children--;
-	if (xbs->xbs_connecting_children == 0
-	 && (xbs->xbs_flags & XBS_ATTACH_CH_ACTIVE) != 0) {
+	if ((xbs->xbs_flags & XBS_ATTACH_CH_ACTIVE) != 0) {
 		xbs->xbs_flags &= ~XBS_ATTACH_CH_ACTIVE;
 		mtx_unlock(&xbs->xbs_lock);
 		config_intrhook_disestablish(&xbs->xbs_attach_ch);