--- xnu/xnu-1456.1.26/iokit/Kernel/IOTimerEventSource.cpp
+++ xnu/xnu-1228/iokit/Kernel/IOTimerEventSource.cpp
@@ -89,7 +89,7 @@
             if (doit && me->enabled && AbsoluteTime_to_scalar(&me->abstime))
             {
                 IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
-                                    (uintptr_t) doit, (uintptr_t) me->owner);
+                                    (unsigned int) doit, (unsigned int) me->owner);
                 (*doit)(me->owner, me);
             }
             wl->openGate();
@@ -97,12 +97,9 @@
     }
 }
 
-void IOTimerEventSource::timeoutAndRelease(void * self, void * c)
+void IOTimerEventSource::timeoutAndRelease(void * self, void * count)
 {
     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)
     {
@@ -113,10 +110,10 @@
             Action doit;
             wl->closeGate();
             doit = (Action) me->action;
-            if (doit && (me->reserved->calloutGeneration == count))
+            if (doit && (me->reserved->calloutGeneration == (SInt32) count))
             {
                 IOTimeStampConstant(IODBG_TIMES(IOTIMES_ACTION),
-                                    (uintptr_t) doit, (uintptr_t) me->owner);
+                                    (unsigned int) doit, (unsigned int) me->owner);
                 (*doit)(me->owner, me);
             }
             wl->openGate();
@@ -230,7 +227,6 @@
     return wakeAtTime(end);
 }
 
-#if !defined(__LP64__)
 IOReturn IOTimerEventSource::setTimeout(mach_timespec_t interval)
 {
     AbsoluteTime end, nsecs;
@@ -243,7 +239,6 @@
 
     return wakeAtTime(end);
 }
-#endif
 
 IOReturn IOTimerEventSource::setTimeout(AbsoluteTime interval)
 {
@@ -278,7 +273,6 @@
     return wakeAtTime(end);
 }
 
-#if !defined(__LP64__)
 IOReturn IOTimerEventSource::wakeAtTime(mach_timespec_t inAbstime)
 {
     AbsoluteTime end, nsecs;
@@ -291,7 +285,6 @@
 
     return wakeAtTime(end);
 }
-#endif
 
 void IOTimerEventSource::setWorkLoop(IOWorkLoop *inWorkLoop)
 {
@@ -306,7 +299,7 @@
         return kIOReturnNoResources;
 
     abstime = inAbstime;
-    if ( enabled && AbsoluteTime_to_scalar(&inAbstime) && AbsoluteTime_to_scalar(&abstime) && workLoop )
+    if ( enabled && AbsoluteTime_to_scalar(&abstime) && workLoop )
     {
         if (reserved)
         {
@@ -315,14 +308,14 @@
             reserved->workLoop = workLoop;
             reserved->calloutGeneration++;
             if (thread_call_enter1_delayed((thread_call_t) calloutEntry, 
-                    (void *) reserved->calloutGeneration, inAbstime))
+                    (void *) reserved->calloutGeneration, abstime))
             {
                 release();
                 workLoop->release();
             }
         }
         else
-            thread_call_enter_delayed((thread_call_t) calloutEntry, inAbstime);
+            thread_call_enter_delayed((thread_call_t) calloutEntry, abstime);
     }
 
     return kIOReturnSuccess;