From 083c44439c86945b995d862e7e5a2db957dd79e2 Mon Sep 17 00:00:00 2001 From: Stefan Lankes Date: Sun, 18 Oct 2015 09:17:29 +0200 Subject: [PATCH] use per_core macro to get the correct value of "timer_ticks" --- hermit/arch/x86/kernel/timer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hermit/arch/x86/kernel/timer.c b/hermit/arch/x86/kernel/timer.c index f74724ae9..77b8d8771 100644 --- a/hermit/arch/x86/kernel/timer.c +++ b/hermit/arch/x86/kernel/timer.c @@ -114,19 +114,19 @@ int timer_wait(unsigned int ticks) * This will continuously loop until the given time has * been reached */ - while (timer_ticks < eticks) { + while (per_core(timer_ticks) < eticks) { check_workqueues(); // recheck break condition - if (timer_ticks >= eticks) + if (per_core(timer_ticks) >= eticks) break; HALT; } - } else if (timer_ticks < eticks) { + } else if (per_core(timer_ticks) < eticks) { check_workqueues(); - if (timer_ticks < eticks) { + if (per_core(timer_ticks) < eticks) { set_timer(eticks); reschedule(); }