Changes in kernel/generic/include/synch/mutex.h [9f2f5ee:76e17d7c] in mainline

File:

• kernel/generic/include/synch/mutex.h (modified) (2 diffs)

kernel/generic/include/synch/mutex.h

@@ -44 +44 @@
         MUTEX_PASSIVE,
         MUTEX_RECURSIVE,
+        MUTEX_ACTIVE
 } mutex_type_t;
 
@@ -50 +51 @@
 typedef struct {
         mutex_type_t type;
-        int nesting;
         semaphore_t sem;
-        _Atomic(struct thread *) owner;
+        struct thread *owner;
+        unsigned nesting;
 } mutex_t;
-
-#define MUTEX_INITIALIZER(name, mtype) (mutex_t) { \
-        .type = (mtype), \
-        .nesting = 0, \
-        .sem = SEMAPHORE_INITIALIZER((name).sem, 1), \
-        .owner = NULL, \
-}
-
-#define MUTEX_INITIALIZE(name, mtype) \
-        mutex_t name = MUTEX_INITIALIZER(name, mtype)
 
 extern void mutex_initialize(mutex_t *, mutex_type_t);