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

Timestamp:

2025-04-10T20:02:30Z (4 days ago)

Author:

GitHub <noreply@…>

Children:

b8b031f

Parents:

a92290d (diff), 90dd8aee (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.

git-author:

Wayne Thornton <wmthornton-dev@…> (2025-04-10 20:02:30)

git-committer:

GitHub <noreply@…> (2025-04-10 20:02:30)

Message:

Merge pull request #6 from HelenOS/master

Merge pending changes from downstream helenos/master

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, \
-        .nesting = 0, \
 }