--- xnu/xnu-1504.9.17/iokit/Kernel/IOTimerEventSource.cpp
+++ xnu/xnu-792.2.4/iokit/Kernel/IOTimerEventSource.cpp
@@ -1,29 +1,23 @@
 /*
  * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_HEADER_START@
  * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. The rights granted to you under the License
- * may not be used to create, or enable the creation or redistribution of,
- * unlawful or unlicensed copies of an Apple operating system, or to
- * circumvent, violate, or enable the circumvention or violation of, any
- * terms of an Apple operating system software license agreement.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.
  * 
- * Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
- * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
+ * @APPLE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1999 Apple Computer, Inc.  All rights reserved. 
@@ -89,7 +83,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 +91,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 +104,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();
@@ -225,12 +216,11 @@
 IOReturn IOTimerEventSource::setTimeout(UInt32 interval, UInt32 scale_factor)
 {
     AbsoluteTime end;
-
+    
     clock_interval_to_deadline(interval, scale_factor, &end);
     return wakeAtTime(end);
 }
 
-#if !defined(__LP64__)
 IOReturn IOTimerEventSource::setTimeout(mach_timespec_t interval)
 {
     AbsoluteTime end, nsecs;
@@ -243,7 +233,6 @@
 
     return wakeAtTime(end);
 }
-#endif
 
 IOReturn IOTimerEventSource::setTimeout(AbsoluteTime interval)
 {
@@ -278,7 +267,6 @@
     return wakeAtTime(end);
 }
 
-#if !defined(__LP64__)
 IOReturn IOTimerEventSource::wakeAtTime(mach_timespec_t inAbstime)
 {
     AbsoluteTime end, nsecs;
@@ -291,7 +279,6 @@
 
     return wakeAtTime(end);
 }
-#endif
 
 void IOTimerEventSource::setWorkLoop(IOWorkLoop *inWorkLoop)
 {
@@ -306,7 +293,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 +302,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;