Changeset cefb126 in mainline for kernel/generic/include/proc/thread.h

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/include/proc/thread.h (modified) (3 diffs)

kernel/generic/include/proc/thread.h

@@ -40 +40 @@
 #include <time/timeout.h>
 #include <cpu.h>
-#include <synch/rwlock.h>
 #include <synch/spinlock.h>
 #include <adt/avl.h>
@@ -155 +154 @@
         int fpu_context_engaged;
         
-        rwlock_type_t rwlock_holder_type;
-        
-        /** Callback fired in scheduler before the thread is put asleep. */
-        void (* call_me)(void *);
-        /** Argument passed to call_me(). */
-        void *call_me_with;
-        
         /** Thread's state. */
         state_t state;
@@ -239 +231 @@
 extern void thread_detach(thread_t *);
 
-extern void thread_register_call_me(void (*)(void *), void *);
 extern void thread_print_list(bool);
 extern void thread_destroy(thread_t *, bool);