Changeset 11b285d in mainline for kernel/generic/src/mm/slab.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/mm/slab.c (modified) (3 diffs)

kernel/generic/src/mm/slab.c

@@ -954 +954 @@
 }
 
-void *malloc(size_t size, unsigned int flags)
+static void *_malloc(size_t size, unsigned int flags)
 {
         assert(_slab_initialized);
@@ -967 +967 @@
 }
 
-void *realloc(void *ptr, size_t size, unsigned int flags)
+void *malloc(size_t size)
+{
+        return _malloc(size, FRAME_ATOMIC);
+}
+
+/** Non-failing malloc.
+ *  Never returns NULL, but may block forever if no memory is available.
+ */
+void *nfmalloc(size_t size)
+{
+        return _malloc(size, 0);
+}
+
+static void *_realloc(void *ptr, size_t size, unsigned int flags)
 {
         assert(_slab_initialized);
@@ -994 +1007 @@
 }
 
+void *realloc(void *ptr, size_t size)
+{
+        return _realloc(ptr, size, FRAME_ATOMIC);
+}
+
 void free(void *ptr)
 {