Changeset 29e7cc7 in mainline for kernel/generic/include/synch/mutex.h

Timestamp:

2025-04-18T15:14:10Z (2 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

e77c3ed

Parents:

800d188 (diff), 25fdb2d (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 branch 'upstream/master' into helenraid

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;
 
@@ -51 +50 @@
 typedef struct {
         mutex_type_t type;
+        int nesting;
         semaphore_t sem;
-        struct thread *owner;
-        unsigned nesting;
+        _Atomic(struct thread *) owner;
 } 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);