Changeset 11b285d in mainline for kernel/generic/src/synch/futex.c

Timestamp:

2018-05-13T15:19:32Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

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

Children:

ad896eb

Parents:

13db2044

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-13 14:59:01)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-13 15:19:32)

Message:

Use standard signature for malloc() in kernel.

The remaining instances of blocking allocation are replaced with
a new separate function named nfmalloc (short for non-failing malloc).

File:

• kernel/generic/src/synch/futex.c (modified) (3 diffs)

kernel/generic/src/synch/futex.c

@@ -156 +156 @@
 void futex_task_init(struct task *task)
 {
-        task->futexes = malloc(sizeof(struct futex_cache), 0);
+        task->futexes = nfmalloc(sizeof(struct futex_cache));
 
         cht_create(&task->futexes->ht, 0, 0, 0, true, &task_futex_ht_ops);
@@ -339 +339 @@
 static futex_t *get_and_cache_futex(uintptr_t phys_addr, uintptr_t uaddr)
 {
-        futex_t *futex = malloc(sizeof(futex_t), FRAME_ATOMIC);
+        futex_t *futex = malloc(sizeof(futex_t));
         if (!futex)
                 return NULL;
@@ -365 +365 @@
          * Cache the link to the futex object for this task.
          */
-        futex_ptr_t *fut_ptr = malloc(sizeof(futex_ptr_t), FRAME_ATOMIC);
+        futex_ptr_t *fut_ptr = malloc(sizeof(futex_ptr_t));
         if (!fut_ptr) {
                 spinlock_lock(&futex_ht_lock);