Changeset aaa3c457 in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2018-11-12T10:36:10Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a43dfcb

Parents:

3ce781f4 (diff), 6874bd2 (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:

Jakub Jermář <jakub@…> (2018-11-12 10:36:10)

git-committer:

GitHub <noreply@…> (2018-11-12 10:36:10)

Message:

Merge pull request #56 from jermar/futexremoval

Remove kernel support for futexes in favor of waitq kobjects.

File:

• kernel/generic/src/proc/thread.c (modified) (2 diffs)

kernel/generic/src/proc/thread.c

@@ -48 +48 @@
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
+#include <synch/syswaitq.h>
 #include <cpu.h>
 #include <str.h>
@@ -519 +520 @@
                          */
                         ipc_cleanup();
-                        futex_task_cleanup();
+                        sys_waitq_task_cleanup();
                         LOG("Cleanup of task %" PRIu64 " completed.", TASK->taskid);
                 }