Changeset 4f3aa76 in mainline for kernel/generic/src/mm/slab.c

Timestamp:

2018-11-09T22:03:24Z (7 years ago)

Author:

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

Branches:

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

Children:

ba9a150

Parents:

b389f95

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-08 01:26:04)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-09 22:03:24)

Message:

Remove nfmalloc()

File:

• kernel/generic/src/mm/slab.c (modified) (4 diffs)

kernel/generic/src/mm/slab.c

@@ -954 +954 @@
 }
 
-static void *_malloc(size_t size, unsigned int flags)
+void *malloc(size_t size)
 {
         assert(_slab_initialized);
@@ -964 +964 @@
         uint8_t idx = fnzb(size - 1) - SLAB_MIN_MALLOC_W + 1;
 
-        return slab_alloc(malloc_caches[idx], 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)
+        return slab_alloc(malloc_caches[idx], FRAME_ATOMIC);
+}
+
+void *realloc(void *ptr, size_t size)
 {
         assert(_slab_initialized);
@@ -992 +979 @@
                 uint8_t idx = fnzb(size - 1) - SLAB_MIN_MALLOC_W + 1;
 
-                new_ptr = slab_alloc(malloc_caches[idx], flags);
+                new_ptr = slab_alloc(malloc_caches[idx], FRAME_ATOMIC);
         } else
                 new_ptr = NULL;
@@ -1007 +994 @@
 }
 
-void *realloc(void *ptr, size_t size)
-{
-        return _realloc(ptr, size, FRAME_ATOMIC);
-}
-
 void free(void *ptr)
 {