--- xnu/xnu-3248.50.21/iokit/Kernel/IOTimerEventSource.cpp
+++ xnu/xnu-1504.3.12/iokit/Kernel/IOTimerEventSource.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998-2000, 2009-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -25,6 +25,17 @@
  * 
  * @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>
 
@@ -40,10 +51,6 @@
 #include <IOKit/IOWorkLoop.h>
 
 #include <IOKit/IOTimeStamp.h>
-#include <IOKit/IOKitDebug.h>
-#if CONFIG_DTRACE
-#include <mach/sdt.h>
-#endif
 
 #define super IOEventSource
 OSDefineMetaClassAndStructors(IOTimerEventSource, IOEventSource)
@@ -56,50 +63,19 @@
 OSMetaClassDefineReservedUnused(IOTimerEventSource, 6);
 OSMetaClassDefineReservedUnused(IOTimerEventSource, 7);
 
-#if IOKITSTATS
-
-#define IOStatisticsInitializeCounter() \
-do { \
-	IOStatistics::setCounterType(IOEventSource::reserved->counter, kIOStatisticsTimerEventSourceCounter); \
-} while (0)
-
-#define IOStatisticsOpenGate() \
-do { \
-	IOStatistics::countOpenGate(me->IOEventSource::reserved->counter); \
-} while (0)
-
-#define IOStatisticsCloseGate() \
-do { \
-	IOStatistics::countCloseGate(me->IOEventSource::reserved->counter); \
-} while (0)
-
-#define IOStatisticsTimeout() \
-do { \
-	IOStatistics::countTimerTimeout(me->IOEventSource::reserved->counter); \
-} while (0)
-
-#else
-
-#define IOStatisticsInitializeCounter()
-#define IOStatisticsOpenGate()
-#define IOStatisticsCloseGate()
-#define IOStatisticsTimeout()
-
-#endif /* IOKITSTATS */
-
 // 
 // reserved != 0 means IOTimerEventSource::timeoutAndRelease is being used,
 // not a subclassed implementation. 
 //
 
+bool IOTimerEventSource::checkForWork() { return false; }
+
 // Timeout handler function. This function is called by the kernel when
 // the timeout interval expires.
 //
 void IOTimerEventSource::timeout(void *self)
 {
     IOTimerEventSource *me = (IOTimerEventSource *) self;
-
-    IOStatisticsTimeout();
 
     if (me->enabled && me->action)
     {
@@ -109,26 +85,13 @@
         {
             Action doit;
             wl->closeGate();
-            IOStatisticsCloseGate();
             doit = (Action) me->action;
             if (doit && me->enabled && AbsoluteTime_to_scalar(&me->abstime))
             {
-            	bool    trace = (gIOKitTrace & kIOTraceTimers) ? true : false;
-            	
-            	if (trace)
-                	IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
-											 VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
-				
+                IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
+                                    (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);
             }
-            IOStatisticsOpenGate();
             wl->openGate();
         }
     }
@@ -141,8 +104,6 @@
 	   must be cast to "long" before, in order to tell GCC we're not truncating a pointer. */
 	SInt32 count = (SInt32) (long) c;
 
-    IOStatisticsTimeout();
-	
     if (me->enabled && me->action)
     {
         IOWorkLoop *
@@ -151,26 +112,13 @@
         {
             Action doit;
             wl->closeGate();
-            IOStatisticsCloseGate();
             doit = (Action) me->action;
             if (doit && (me->reserved->calloutGeneration == count))
             {
-            	bool    trace = (gIOKitTrace & kIOTraceTimers) ? true : false;
-            	
-            	if (trace)
-                	IOTimeStampStartConstant(IODBG_TIMES(IOTIMES_ACTION),
-											 VM_KERNEL_UNSLIDE(doit), (uintptr_t) me->owner);
-				
+                IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
+                                    (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);
             }
-            IOStatisticsOpenGate();
             wl->openGate();
         }
     }
@@ -196,8 +144,6 @@
     setTimeoutFunc();
     if (!calloutEntry)
         return false;
-
-    IOStatisticsInitializeCounter();
 
     return true;
 }
@@ -369,7 +315,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();