Changeset 95c675b in mainline for kernel/generic/include/synch/futex.h

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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 mainline

File:

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

kernel/generic/include/synch/futex.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <synch/waitq.h>
+#include <adt/hash_table.h>
 
 /** Kernel-side futex structure. */
@@ -46 +47 @@
         waitq_t wq;
         /** Futex hash table link. */
-        link_t ht_link;
+        ht_link_t ht_link;
         /** Number of tasks that reference this futex. */
         size_t refcount;