Changeset abf6c01 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:

436a0a5

Parents:

ba9a150

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-11-08 17:00:46)

git-committer:

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

Message:

Add FRAME_ATOMIC to some allocations

File:

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

kernel/generic/src/mm/slab.c

@@ -667 +667 @@
     size_t (*destructor)(void *obj), unsigned int flags)
 {
-        slab_cache_t *cache = slab_alloc(&slab_cache_cache, 0);
+        slab_cache_t *cache = slab_alloc(&slab_cache_cache, FRAME_ATOMIC);
+        if (!cache)
+                panic("Not enough memory to allocate slab cache %s.", name);
+
         _slab_cache_create(cache, name, size, align, constructor, destructor,
             flags);
@@ -730 +733 @@
 NO_TRACE static void _slab_free(slab_cache_t *cache, void *obj, slab_t *slab)
 {
+        if (!obj)
+                return;
+
         ipl_t ipl = interrupts_disable();