diff options
-rw-r--r-- | kern/condition.c | 8 | ||||
-rw-r--r-- | kern/condition.h | 8 |
2 files changed, 7 insertions, 9 deletions
diff --git a/kern/condition.c b/kern/condition.c index ccd86c5b..85fa6106 100644 --- a/kern/condition.c +++ b/kern/condition.c @@ -32,14 +32,6 @@ #include <kern/thread.h> void -condition_init(struct condition *condition) -{ - spinlock_init(&condition->lock); - condition->mutex = NULL; - list_init(&condition->waiters); -} - -void condition_wait(struct condition *condition, struct mutex *mutex) { struct mutex_waiter waiter; diff --git a/kern/condition.h b/kern/condition.h index 1b0242e7..6802063b 100644 --- a/kern/condition.h +++ b/kern/condition.h @@ -35,7 +35,13 @@ struct condition { #define CONDITION_INITIALIZER(condition) \ { SPINLOCK_INITIALIZER, NULL, LIST_INITIALIZER((condition).waiters) } -void condition_init(struct condition *cond); +static inline void +condition_init(struct condition *condition) +{ + spinlock_init(&condition->lock); + condition->mutex = NULL; + list_init(&condition->waiters); +} void condition_wait(struct condition *cond, struct mutex *mutex); |