X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/4b17d6b6e417f714551ec129064745ea9919780e..04b8595b18b1b41ac7a206e4b3d51a635f8413d7:/iokit/Kernel/IOTimerEventSource.cpp

diff --git a/iokit/Kernel/IOTimerEventSource.cpp b/iokit/Kernel/IOTimerEventSource.cpp
index e42fa436c..df939da91 100644
--- a/iokit/Kernel/IOTimerEventSource.cpp
+++ b/iokit/Kernel/IOTimerEventSource.cpp
@@ -41,7 +41,6 @@ __END_DECLS
 
 #include <IOKit/IOTimeStamp.h>
 #include <IOKit/IOKitDebug.h>
-
 #if CONFIG_DTRACE
 #include <mach/sdt.h>
 #endif
@@ -118,7 +117,7 @@ void IOTimerEventSource::timeout(void *self)
             	
             	if (trace)
                 	IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
-											 (uintptr_t) doit, (uintptr_t) me->owner);
+											 VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
 				
                 (*doit)(me->owner, me);
 #if CONFIG_DTRACE
@@ -127,7 +126,7 @@ void IOTimerEventSource::timeout(void *self)
                 
 				if (trace)
                 	IOTimeStampEndConstant(IODBG_TIMES(IOTIMES_ACTION),
-										   (uintptr_t) doit, (uintptr_t) me->owner);
+										   VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
             }
             IOStatisticsOpenGate();
             wl->openGate();
@@ -160,7 +159,7 @@ void IOTimerEventSource::timeoutAndRelease(void * self, void * c)
             	
             	if (trace)
                 	IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
-											 (uintptr_t) doit, (uintptr_t) me->owner);
+											 VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
 				
                 (*doit)(me->owner, me);
 #if CONFIG_DTRACE
@@ -169,7 +168,7 @@ void IOTimerEventSource::timeoutAndRelease(void * self, void * c)
                 
 				if (trace)
                 	IOTimeStampEndConstant(IODBG_TIMES(IOTIMES_ACTION),
-										   (uintptr_t) doit, (uintptr_t) me->owner);
+										   VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
             }
             IOStatisticsOpenGate();
             wl->openGate();
@@ -370,7 +369,7 @@ IOReturn IOTimerEventSource::wakeAtTime(AbsoluteTime inAbstime)
             reserved->workLoop = workLoop;
             reserved->calloutGeneration++;
             if (thread_call_enter1_delayed((thread_call_t) calloutEntry, 
-                    (void *) reserved->calloutGeneration, inAbstime))
+                    (void *)(uintptr_t) reserved->calloutGeneration, inAbstime))
             {
                 release();
                 workLoop->release();