xnu-7195.50.7.100.1.tar.gz

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

diff --git a/osfmk/kern/timer.c b/osfmk/kern/timer.c
index 4be4464cba479ba4f5c35f57e7751738ba4244e3..695efa4c950391b21d226ef1fe80c81bc7b80a5b 100644 (file)
--- a/osfmk/kern/timer.c
+++ b/osfmk/kern/timer.c
@@ -62,7 +62,9 @@
 #include <kern/sched_prim.h>
 #include <kern/timer.h>
 
-#if CONFIG_EMBEDDED
+#include <machine/config.h>
+
+#if CONFIG_SKIP_PRECISE_USER_KERNEL_TIME && !HAS_FAST_CNTVCT
 int precise_user_kernel_time = 0;
 #else
 int precise_user_kernel_time = 1;
@@ -139,10 +141,10 @@ processor_timer_switch_thread(uint64_t tstamp, timer_t new_timer)
        timer_t timer;
 
        /* Update current timer. */
-       timer = PROCESSOR_DATA(processor, thread_timer);
+       timer = processor->thread_timer;
        timer_advance(timer, tstamp - timer->tstamp);
 
        /* Start new timer. */
-       PROCESSOR_DATA(processor, thread_timer) = new_timer;
+       processor->thread_timer = new_timer;
        new_timer->tstamp = tstamp;
 }