xnu-2050.9.2

Imported from https://opensource.apple.com/tarballs/xnu/xnu-2050.9.2.tar.gz
dmwlei · Jun 4, 2017 · a849f5b · a849f5b
1 parent 8e385d8
commit a849f5b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/config/MasterVersion b/config/MasterVersion
@@ -1,4 +1,4 @@
-12.0.0
+12.1.0
 
 # The first line of this file contains the master version number for the kernel.
 # All other instances of the kernel version in xnu are derived from this file.

diff --git a/iokit/Kernel/IOServicePM.cpp b/iokit/Kernel/IOServicePM.cpp
@@ -1049,7 +1049,7 @@ void IOService::addPowerChild3 ( IOPMRequest * request )
 
 	if (child && inPlane(gIOPowerPlane))
 	{
-		if (child->getProperty("IOPMStrictTreeOrder"))
+		if ((this != rootDomain) && child->getProperty("IOPMStrictTreeOrder"))
 		{
 			PM_LOG1("%s: strict PM order enforced\n", getName());
 			fStrictTreeOrder = true;
@@ -3487,8 +3487,8 @@ void IOService::notifyChildrenOrdered ( void )
 	{
 		IOPowerConnection *	connection;
 		connection = (IOPowerConnection *) fNotifyChildArray->getObject(0);
-		fNotifyChildArray->removeObject(0);
 		notifyChild( connection );
+		fNotifyChildArray->removeObject(0);
 	}
 	else
 	{
@@ -3779,7 +3779,6 @@ bool IOService::notifyChild ( IOPowerConnection * theNub )
     theChild = (IOService *)(theNub->copyChildEntry(gIOPowerPlane));
     if (!theChild)
     {
-		assert(false);
         return true;
     }