xnu-792.24.17.tar.gz

[apple/xnu.git] / osfmk / kern / timer_call.c

diff --git a/osfmk/kern/timer_call.c b/osfmk/kern/timer_call.c
index 60ac2fc7ac001dab6d2434027f2f5f96f22b782b..fd48c39597615dfc76f1bd8dc82413596d0589d4 100644 (file)
--- a/osfmk/kern/timer_call.c
+++ b/osfmk/kern/timer_call.c
@@ -2,29 +2,23 @@
  * Copyright (c) 1993-1995, 1999-2004 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@
  */
 /*
  * Timer interrupt callout module.
@@ -43,8 +37,6 @@
 #include <kern/timer_call.h>
 #include <kern/call_entry.h>
 
-#include <sys/kdebug.h>
-
 decl_simple_lock_data(static,timer_call_lock)
 
 static struct {
@@ -127,7 +119,7 @@ void
 _set_delayed_call_timer(
        timer_call_t                    call)
 {
-       etimer_set_deadline(call->deadline);
+       clock_set_timer_deadline(call->deadline);
 }
 
 boolean_t
@@ -292,7 +284,6 @@ timer_call_interrupt(
        call = TC(queue_first(queue));
 
        while (!queue_end(queue, qe(call))) {
-
                if (call->deadline <= timestamp) {
                        timer_call_func_t               func;
                        timer_call_param_t              param0, param1;
@@ -305,12 +296,8 @@ timer_call_interrupt(
 
                        simple_unlock(&timer_call_lock);
 
-                       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_DECI, 2) | DBG_FUNC_START, (int)func, param0, param1, 0, 0);
-
                        (*func)(param0, param1);
 
-                       KERNEL_DEBUG_CONSTANT(MACHDBG_CODE(DBG_MACH_EXCP_DECI, 2) | DBG_FUNC_END, (int)func, param0, param1, 0, 0);
-
                        simple_lock(&timer_call_lock);
                }
                else
@@ -323,5 +310,4 @@ timer_call_interrupt(
                _set_delayed_call_timer(call);
 
        simple_unlock(&timer_call_lock);
-
 }