Loading...
--- xnu/xnu-517.3.15/iokit/Kernel/IOStartIOKit.cpp
+++ xnu/xnu-792.6.56/iokit/Kernel/IOStartIOKit.cpp
@@ -2,8 +2,6 @@
* Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
- *
- * Copyright (c) 1999-2003 Apple Computer, Inc. All Rights Reserved.
*
* This file contains Original Code and/or Modifications of Original Code
* as defined in and that are subject to the Apple Public Source License
@@ -30,6 +28,7 @@
*/
#include <libkern/c++/OSUnserialize.h>
+#include <libkern/version.h>
#include <IOKit/IORegistryEntry.h>
#include <IOKit/IODeviceTreeSupport.h>
#include <IOKit/IOCatalogue.h>
@@ -42,10 +41,11 @@
#include <IOKit/assert.h>
+#include "IOKitKernelInternal.h"
+
extern "C" {
extern void OSlibkernInit (void);
-extern void IOLibInit(void);
#include <kern/clock.h>
@@ -79,8 +79,6 @@
OSDictionary * fakeKmods; // must release
OSCollectionIterator * kmodIter; // must release
OSString * kmodName; // don't release
-
- IOLog( iokit_version );
if( PE_parse_boot_arg( "io", &debugFlags ))
gIOKitDebug = debugFlags;
@@ -129,8 +127,13 @@
"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());
}
@@ -148,7 +151,7 @@
IOUserClient::initialize();
IOMemoryDescriptor::initialize();
- obj = OSString::withCString( iokit_version );
+ obj = OSString::withCString( version );
assert( obj );
if( obj ) {
root->setProperty( kIOKitBuildVersionKey, obj );