X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e:/iokit/Kernel/IOCPU.cpp?ds=sidebyside

diff --git a/iokit/Kernel/IOCPU.cpp b/iokit/Kernel/IOCPU.cpp
index 64b3a283f..db5936a5b 100644
--- a/iokit/Kernel/IOCPU.cpp
+++ b/iokit/Kernel/IOCPU.cpp
@@ -229,9 +229,12 @@ bool IOCPU::setProperty(const OSSymbol *aKey, OSObject *anObject)
 
 bool IOCPU::serializeProperties(OSSerialize *serialize) const
 {
-  super::setProperty(gIOCPUStateKey, gIOCPUStateNames[_cpuState]);
-  
-  return super::serializeProperties(serialize);
+	bool result;
+	OSDictionary *dict = dictionaryWithProperties();
+	dict->setObject(gIOCPUStateKey, gIOCPUStateNames[_cpuState]);
+	result = dict->serialize(serialize);
+	dict->release();  
+	return result;
 }
 
 IOReturn IOCPU::setProperties(OSObject *properties)
@@ -394,8 +397,10 @@ void IOCPUInterruptController::setCPUInterruptProperties(IOService *service)
 
 void IOCPUInterruptController::enableCPUInterrupt(IOCPU *cpu)
 {
-  ml_install_interrupt_handler(cpu, cpu->getCPUNumber(), this,
-                               (IOInterruptHandler)&IOCPUInterruptController::handleInterrupt, 0);
+	IOInterruptHandler handler = OSMemberFunctionCast(
+		IOInterruptHandler, this, &IOCPUInterruptController::handleInterrupt);
+
+	ml_install_interrupt_handler(cpu, cpu->getCPUNumber(), this, handler, 0);
   
   enabledCPUs++;