Changeset 11b285d in mainline for kernel/generic/include

Timestamp:

2018-05-13T15:19:32Z (7 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).

Location:

kernel/generic/include

Files:

• adt/fifo.h (modified) (1 diff)
• mm/slab.h (modified) (1 diff)
• synch/rcu.h (modified) (1 diff)

kernel/generic/include/adt/fifo.h

@@ -115 +115 @@
  */
 #define fifo_create(name) \
-        name.fifo = malloc(sizeof(*name.fifo) * name.items, 0)
+        name.fifo = nfmalloc(sizeof(*name.fifo) * name.items)
 
 #endif

kernel/generic/include/mm/slab.h

@@ -140 +140 @@
 
 /* malloc support */
-extern void *malloc(size_t, unsigned int)
+extern void *malloc(size_t)
     __attribute__((malloc));
-extern void *realloc(void *, size_t, unsigned int)
+extern void *realloc(void *, size_t)
     __attribute__((warn_unused_result));
 extern void free(void *);
+
+extern void *nfmalloc(size_t)
+    __attribute__((malloc, returns_nonnull));
 
 #endif

kernel/generic/include/synch/rcu.h

@@ -55 +55 @@
  *
  * // Insert at the beginning of the list.
- * exam_t *my_exam = malloc(sizeof(exam_t), FRAME_ATOMIC);
+ * exam_t *my_exam = malloc(sizeof(exam_t));
  * my_exam->grade = 5;
  * my_exam->next = exam_list;