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

Timestamp:

2015-07-28T11:28:14Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce32 (diff), 47726b5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from the mainline

File:

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

kernel/generic/src/mm/slab.c

@@ -610 +610 @@
     unsigned int kmflag), size_t (*destructor)(void *obj), unsigned int flags)
 {
+        ASSERT(size > 0);
+        
         memsetb(cache, sizeof(*cache), 0);
         cache->name = name;
@@ -888 +890 @@
         /* Initialize magazine cache */
         _slab_cache_create(&mag_cache, "slab_magazine_t",
-            sizeof(slab_magazine_t) + SLAB_MAG_SIZE * sizeof(void*),
+            sizeof(slab_magazine_t) + SLAB_MAG_SIZE * sizeof(void *),
             sizeof(uintptr_t), NULL, NULL, SLAB_CACHE_NOMAGAZINE |
             SLAB_CACHE_SLINSIDE);