Changeset cefb126 in mainline for kernel/generic/src/proc/thread.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/thread.c (modified) (4 diffs)

kernel/generic/src/proc/thread.c

@@ -48 +48 @@
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
-#include <synch/rwlock.h>
 #include <cpu.h>
 #include <str.h>
@@ -329 +328 @@
         thread->flags = flags;
         thread->state = Entering;
-        thread->call_me = NULL;
-        thread->call_me_with = NULL;
         
         timeout_initialize(&thread->sleep_timeout);
@@ -343 +340 @@
         thread->detached = false;
         waitq_initialize(&thread->join_wq);
-        
-        thread->rwlock_holder_type = RWLOCK_NONE;
         
         thread->task = task;
@@ -583 +578 @@
         
         (void) waitq_sleep_timeout(&wq, usec, SYNCH_FLAGS_NON_BLOCKING);
-}
-
-/** Register thread out-of-context invocation
- *
- * Register a function and its argument to be executed
- * on next context switch to the current thread. Must
- * be called with interrupts disabled.
- *
- * @param call_me      Out-of-context function.
- * @param call_me_with Out-of-context function argument.
- *
- */
-void thread_register_call_me(void (* call_me)(void *), void *call_me_with)
-{
-        irq_spinlock_lock(&THREAD->lock, false);
-        THREAD->call_me = call_me;
-        THREAD->call_me_with = call_me_with;
-        irq_spinlock_unlock(&THREAD->lock, false);
 }