Changeset 58775d30 in mainline for kernel/generic/src/time/clock.c

Timestamp:

2015-03-16T16:07:21Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2003739

Parents:

6069061 (diff), 795e2bf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Mainline changes

File:

• kernel/generic/src/time/clock.c (modified) (1 diff)

kernel/generic/src/time/clock.c

@@ -212 +212 @@
                 irq_spinlock_unlock(&THREAD->lock, false);
                 
-                if ((!ticks) && (!PREEMPTION_DISABLED)) {
+                if (ticks == 0 && PREEMPTION_ENABLED) {
                         scheduler();
 #ifdef CONFIG_UDEBUG