--- xnu/xnu-1228/iokit/Kernel/IOTimerEventSource.cpp
+++ xnu/xnu-1504.15.3/iokit/Kernel/IOTimerEventSource.cpp
@@ -25,17 +25,6 @@
  * 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
-/*
- * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
- *
- * IOTimerEventSource.cpp
- *
- * HISTORY
- * 2-Feb-1999		Joe Liu (jliu) created.
- * 1999-10-14		Godfrey van der Linden(gvdl)
- *		Revamped to use thread_call APIs
- *
- */
 
 #include <sys/cdefs.h>
 
@@ -51,6 +40,7 @@
 #include <IOKit/IOWorkLoop.h>
 
 #include <IOKit/IOTimeStamp.h>
+#include <IOKit/IOKitDebug.h>
 
 #define super IOEventSource
 OSDefineMetaClassAndStructors(IOTimerEventSource, IOEventSource)
@@ -88,18 +78,29 @@
             doit = (Action) me->action;
             if (doit && me->enabled && AbsoluteTime_to_scalar(&me->abstime))
             {
-                IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
-                                    (unsigned int) doit, (unsigned int) me->owner);
+            	bool    trace = (gIOKitTrace & kIOTraceTimers) ? true : false;
+            	
+            	if (trace)
+                	IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
+                                    (uintptr_t) doit, (uintptr_t) me->owner);
+				
                 (*doit)(me->owner, me);
+                
+				if (trace)
+                	IOTimeStampEndConstant(IODBG_TIMES(IOTIMES_ACTION),
+										   (uintptr_t) doit, (uintptr_t) me->owner);
             }
             wl->openGate();
         }
     }
 }
 
-void IOTimerEventSource::timeoutAndRelease(void * self, void * count)
+void IOTimerEventSource::timeoutAndRelease(void * self, void * c)
 {
     IOTimerEventSource *me = (IOTimerEventSource *) self;
+	/* The second parameter (a pointer) gets abused to carry an SInt32, so on LP64, "count"
+	   must be cast to "long" before, in order to tell GCC we're not truncating a pointer. */
+	SInt32 count = (SInt32) (long) c;
 
     if (me->enabled && me->action)
     {
@@ -110,11 +111,19 @@
             Action doit;
             wl->closeGate();
             doit = (Action) me->action;
-            if (doit && (me->reserved->calloutGeneration == (SInt32) count))
+            if (doit && (me->reserved->calloutGeneration == count))
             {
-                IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
-                                    (unsigned int) doit, (unsigned int) me->owner);
+            	bool    trace = (gIOKitTrace & kIOTraceTimers) ? true : false;
+            	
+            	if (trace)
+                	IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
+                                    (uintptr_t) doit, (uintptr_t) me->owner);
+				
                 (*doit)(me->owner, me);
+                
+				if (trace)
+                	IOTimeStampEndConstant(IODBG_TIMES(IOTIMES_ACTION),
+										   (uintptr_t) doit, (uintptr_t) me->owner);
             }
             wl->openGate();
         }
@@ -227,6 +236,7 @@
     return wakeAtTime(end);
 }
 
+#if !defined(__LP64__)
 IOReturn IOTimerEventSource::setTimeout(mach_timespec_t interval)
 {
     AbsoluteTime end, nsecs;
@@ -239,6 +249,7 @@
 
     return wakeAtTime(end);
 }
+#endif
 
 IOReturn IOTimerEventSource::setTimeout(AbsoluteTime interval)
 {
@@ -273,6 +284,7 @@
     return wakeAtTime(end);
 }
 
+#if !defined(__LP64__)
 IOReturn IOTimerEventSource::wakeAtTime(mach_timespec_t inAbstime)
 {
     AbsoluteTime end, nsecs;
@@ -285,6 +297,7 @@
 
     return wakeAtTime(end);
 }
+#endif
 
 void IOTimerEventSource::setWorkLoop(IOWorkLoop *inWorkLoop)
 {
@@ -299,7 +312,7 @@
         return kIOReturnNoResources;
 
     abstime = inAbstime;
-    if ( enabled && AbsoluteTime_to_scalar(&abstime) && workLoop )
+    if ( enabled && AbsoluteTime_to_scalar(&inAbstime) && AbsoluteTime_to_scalar(&abstime) && workLoop )
     {
         if (reserved)
         {
@@ -308,14 +321,14 @@
             reserved->workLoop = workLoop;
             reserved->calloutGeneration++;
             if (thread_call_enter1_delayed((thread_call_t) calloutEntry, 
-                    (void *) reserved->calloutGeneration, abstime))
+                    (void *) reserved->calloutGeneration, inAbstime))
             {
                 release();
                 workLoop->release();
             }
         }
         else
-            thread_call_enter_delayed((thread_call_t) calloutEntry, abstime);
+            thread_call_enter_delayed((thread_call_t) calloutEntry, inAbstime);
     }
 
     return kIOReturnSuccess;