xnu-2050.9.2.tar.gz

diff --git a/config/MasterVersion b/config/MasterVersion
index 1bf9f88187c162a86217e4dfed717d6e54be0539..7b10c32ce11ea6346373f64a7f8e703894c3f6f7 100644 (file)
--- 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.
 
 # 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
index 814a402efae183d1723bf30e65251578e602f5ef..3c76e4d0903b013e235c918178de0fb29f32acfa 100644 (file)
--- 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 && inPlane(gIOPowerPlane))
        {

-               if (child->getProperty("IOPMStrictTreeOrder"))
+               if ((this != rootDomain) && child->getProperty("IOPMStrictTreeOrder"))

                {
                        PM_LOG1("%s: strict PM order enforced\n", getName());
                        fStrictTreeOrder = true;
                {
                        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);
        {
                IOPowerConnection *     connection;
                connection = (IOPowerConnection *) fNotifyChildArray->getObject(0);

-               fNotifyChildArray->removeObject(0);

                notifyChild( connection );
                notifyChild( connection );

+               fNotifyChildArray->removeObject(0);

        }
        else
        {
        }
        else
        {


@@ -3779,7 +3779,6 @@ bool IOService::notifyChild ( IOPowerConnection * theNub )
     theChild = (IOService *)(theNub->copyChildEntry(gIOPowerPlane));
     if (!theChild)
     {
     theChild = (IOService *)(theNub->copyChildEntry(gIOPowerPlane));
     if (!theChild)
     {

-               assert(false);

         return true;
     }
 
         return true;
     }