Changeset cefb126 in mainline for kernel/generic/src/proc/scheduler.c

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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:

Merge mainline changes.

File:

• kernel/generic/src/proc/scheduler.c (modified) (3 diffs)

kernel/generic/src/proc/scheduler.c

@@ -193 +193 @@
                  * This improves energy saving and hyperthreading.
                  */
-                
-                 /* Mark CPU as it was idle this clock tick */
                 irq_spinlock_lock(&CPU->lock, false);
                 CPU->idle = true;
                 irq_spinlock_unlock(&CPU->lock, false);
-                
                 interrupts_enable();
+                
                 /*
                  * An interrupt might occur right now and wake up a thread.
@@ -386 +384 @@
         as_t *old_as = AS;
         
-        ASSERT(!THREAD || irq_spinlock_locked(&THREAD->lock));
+        ASSERT((!THREAD) || (irq_spinlock_locked(&THREAD->lock)));
         ASSERT(CPU != NULL);
         
@@ -457 +455 @@
                         irq_spinlock_unlock(&THREAD->sleep_queue->lock, false);
                         
-                        /*
-                         * Check for possible requests for out-of-context
-                         * invocation.
-                         *
-                         */
-                        if (THREAD->call_me) {
-                                THREAD->call_me(THREAD->call_me_with);
-                                THREAD->call_me = NULL;
-                                THREAD->call_me_with = NULL;
-                        }
-                        
                         irq_spinlock_unlock(&THREAD->lock, false);
-                        
                         break;