Changes in kernel/generic/src/time/clock.c [b2e121a:b0c2075] in mainline

File:

• kernel/generic/src/time/clock.c (modified) (2 diffs)

kernel/generic/src/time/clock.c

@@ -46 +46 @@
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
-#include <halt.h>
+#include <func.h>
 #include <proc/scheduler.h>
 #include <cpu.h>
@@ -212 +212 @@
                 irq_spinlock_unlock(&THREAD->lock, false);
                 
-                if (ticks == 0 && PREEMPTION_ENABLED) {
+                if ((!ticks) && (!PREEMPTION_DISABLED)) {
                         scheduler();
 #ifdef CONFIG_UDEBUG