Loading...
--- xnu/xnu-3248.50.21/iokit/Kernel/IOTimerEventSource.cpp
+++ xnu/xnu-1699.26.8/iokit/Kernel/IOTimerEventSource.cpp
@@ -41,9 +41,6 @@
#include <IOKit/IOTimeStamp.h>
#include <IOKit/IOKitDebug.h>
-#if CONFIG_DTRACE
-#include <mach/sdt.h>
-#endif
#define super IOEventSource
OSDefineMetaClassAndStructors(IOTimerEventSource, IOEventSource)
@@ -117,16 +114,13 @@
if (trace)
IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
- VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
+ (uintptr_t) doit, (uintptr_t) me->owner);
(*doit)(me->owner, me);
-#if CONFIG_DTRACE
- DTRACE_TMR3(iotescallout__expire, Action, doit, OSObject, me->owner, void, me->workLoop);
-#endif
if (trace)
IOTimeStampEndConstant(IODBG_TIMES(IOTIMES_ACTION),
- VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
+ (uintptr_t) doit, (uintptr_t) me->owner);
}
IOStatisticsOpenGate();
wl->openGate();
@@ -159,16 +153,13 @@
if (trace)
IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
- VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
+ (uintptr_t) doit, (uintptr_t) me->owner);
(*doit)(me->owner, me);
-#if CONFIG_DTRACE
- DTRACE_TMR3(iotescallout__expire, Action, doit, OSObject, me->owner, void, me->workLoop);
-#endif
if (trace)
IOTimeStampEndConstant(IODBG_TIMES(IOTIMES_ACTION),
- VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
+ (uintptr_t) doit, (uintptr_t) me->owner);
}
IOStatisticsOpenGate();
wl->openGate();
@@ -369,7 +360,7 @@
reserved->workLoop = workLoop;
reserved->calloutGeneration++;
if (thread_call_enter1_delayed((thread_call_t) calloutEntry,
- (void *)(uintptr_t) reserved->calloutGeneration, inAbstime))
+ (void *) reserved->calloutGeneration, inAbstime))
{
release();
workLoop->release();