Changeset 057e77f in mainline for kernel/generic/src/time/clock.c

Timestamp:

2012-07-16T15:31:56Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

0cf813d

Parents:

0594c7ea

Message:

preemption_disable: Removed failed attempt at rescheduling once preemption is enabled (and needed). Once again, preemption_enable() never reschedules.

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 == 0) {
-                        if (PREEMPTION_ENABLED) {
-                                scheduler();
+                if (ticks == 0 && PREEMPTION_ENABLED) {
+                        scheduler();
 #ifdef CONFIG_UDEBUG
-                                /*
-                                * Give udebug chance to stop the thread
-                                * before it begins executing userspace code.
-                                */
-                                istate_t *istate = THREAD->udebug.uspace_state;
-                                if ((istate) && (istate_from_uspace(istate)))
-                                        udebug_before_thread_runs();
+                        /*
+                         * Give udebug chance to stop the thread
+                         * before it begins executing userspace code.
+                         */
+                        istate_t *istate = THREAD->udebug.uspace_state;
+                        if ((istate) && (istate_from_uspace(istate)))
+                                udebug_before_thread_runs();
 #endif
-                        } else {
-                                preemption_set_needed();
-                        }
                 }
         }