xnu-792.tar.gz

[apple/xnu.git] / iokit / Kernel / IOStartIOKit.cpp

diff --git a/iokit/Kernel/IOStartIOKit.cpp b/iokit/Kernel/IOStartIOKit.cpp
index ab928aefb4b5bc6a7cf80c181e0f1d069c12175d..010c14c5926caecd034677bc956781465a7da47d 100644 (file)
--- a/iokit/Kernel/IOStartIOKit.cpp
+++ b/iokit/Kernel/IOStartIOKit.cpp
@@ -27,6 +27,7 @@
  */
 
 #include <libkern/c++/OSUnserialize.h>
  */
 
 #include <libkern/c++/OSUnserialize.h>

+#include <libkern/version.h>

 #include <IOKit/IORegistryEntry.h>
 #include <IOKit/IODeviceTreeSupport.h>
 #include <IOKit/IOCatalogue.h>
 #include <IOKit/IORegistryEntry.h>
 #include <IOKit/IODeviceTreeSupport.h>
 #include <IOKit/IOCatalogue.h>


@@ -39,10 +40,11 @@
 
 #include <IOKit/assert.h>
 
 
 #include <IOKit/assert.h>
 

+#include "IOKitKernelInternal.h"
+

 extern "C" {
 
 extern void OSlibkernInit (void);
 extern "C" {
 
 extern void OSlibkernInit (void);

-extern void IOLibInit(void);

 
 #include <kern/clock.h>
 
 
 #include <kern/clock.h>
 


@@ -77,8 +79,6 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     OSCollectionIterator *      kmodIter;   // must release
     OSString *                  kmodName;   // don't release
 
     OSCollectionIterator *      kmodIter;   // must release
     OSString *                  kmodName;   // don't release
 

-    IOLog( iokit_version );
-

     if( PE_parse_boot_arg( "io", &debugFlags ))
        gIOKitDebug = debugFlags;
 
     if( PE_parse_boot_arg( "io", &debugFlags ))
        gIOKitDebug = debugFlags;
 


@@ -126,8 +126,13 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
                 "an invalid version.\n",
                 kmodName->getCStringNoCopy());
         }
                 "an invalid version.\n",
                 kmodName->getCStringNoCopy());
         }

-        if (KERN_SUCCESS != kmod_create_fake(kmodName->getCStringNoCopy(),
-                kmodVersion->getCStringNoCopy())) {
+
+       // empty version strings get replaced with current kernel version
+       const char *vers = (strlen(kmodVersion->getCStringNoCopy())
+                                ? kmodVersion->getCStringNoCopy()
+                                : osrelease);
+
+        if (KERN_SUCCESS != kmod_create_fake(kmodName->getCStringNoCopy(), vers)) {

             panic("Failure declaring in-kernel kmod \"%s\".\n",
                 kmodName->getCStringNoCopy());
         }
             panic("Failure declaring in-kernel kmod \"%s\".\n",
                 kmodName->getCStringNoCopy());
         }


@@ -145,7 +150,7 @@ void StartIOKit( void * p1, void * p2, void * p3, void * p4 )
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 
     IOUserClient::initialize();
     IOMemoryDescriptor::initialize();
 

-    obj = OSString::withCString( iokit_version );
+    obj = OSString::withCString( version );

     assert( obj );
     if( obj ) {
         root->setProperty( kIOKitBuildVersionKey, obj );
     assert( obj );
     if( obj ) {
         root->setProperty( kIOKitBuildVersionKey, obj );