diff options
author | Richard Braun <rbraun@sceen.net> | 2014-06-18 23:35:45 +0200 |
---|---|---|
committer | Richard Braun <rbraun@sceen.net> | 2014-06-18 23:35:45 +0200 |
commit | 701a5d9cf5a9416eb8303d703049bf1d4c6c69f0 (patch) | |
tree | 0b0fa70492a01df7fb9511ccd388e220f7fc150d /kern/mutex_i.h | |
parent | 6b5c9352dc34ef945259994b16c3e1fa1783aef4 (diff) |
kern/thread: add thread_join
This change affects more files than it apparently would at first glance.
This is because circular dependencies can easily be created between the
thread, mutex, condition and spinlock modules. As a result, some of the
types of these modules are now defined in kern/types.h.
Diffstat (limited to 'kern/mutex_i.h')
-rw-r--r-- | kern/mutex_i.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kern/mutex_i.h b/kern/mutex_i.h index 85b827d8..a5c1ba31 100644 --- a/kern/mutex_i.h +++ b/kern/mutex_i.h @@ -22,6 +22,7 @@ #include <kern/list.h> #include <kern/spinlock.h> #include <kern/thread.h> +#include <kern/types.h> #include <machine/atomic.h> #define MUTEX_UNLOCKED 0 @@ -33,12 +34,6 @@ struct mutex_waiter { struct thread *thread; }; -struct mutex { - unsigned int state; - struct spinlock lock; - struct list waiters; -}; - void mutex_lock_slow(struct mutex *mutex); void mutex_unlock_slow(struct mutex *mutex); |