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

Timestamp:

2010-05-21T07:50:04Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 mainline changes (rev. 451)

File:

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

kernel/generic/src/mm/slab.c

@@ -130 +130 @@
 /** Caches for malloc */
 static slab_cache_t *malloc_caches[SLAB_MAX_MALLOC_W - SLAB_MIN_MALLOC_W + 1];
-static char *malloc_names[] =  {
+static const char *malloc_names[] =  {
         "malloc-16",
         "malloc-32",
@@ -555 +555 @@
  * Initialize mag_cache structure in slab cache
  */
-static void make_magcache(slab_cache_t *cache)
+static bool make_magcache(slab_cache_t *cache)
 {
         unsigned int i;
@@ -562 +562 @@
 
         cache->mag_cache = malloc(sizeof(slab_mag_cache_t) * config.cpu_count,
-            0);
+            FRAME_ATOMIC);
+        if (!cache->mag_cache)
+                return false;
+
         for (i = 0; i < config.cpu_count; i++) {
                 memsetb(&cache->mag_cache[i], sizeof(cache->mag_cache[i]), 0);
@@ -568 +571 @@
                     "slab_maglock_cpu");
         }
+        return true;
 }
 
 /** Initialize allocated memory as a slab cache */
-static void
-_slab_cache_create(slab_cache_t *cache, char *name, size_t size, size_t align,
-    int (*constructor)(void *obj, int kmflag), int (*destructor)(void *obj),
-    int flags)
+static void _slab_cache_create(slab_cache_t *cache, const char *name,
+    size_t size, size_t align, int (*constructor)(void *obj, int kmflag),
+    int (*destructor)(void *obj), int flags)
 {
         int pages;
@@ -598 +601 @@
         spinlock_initialize(&cache->maglock, "slab_maglock");
         if (!(cache->flags & SLAB_CACHE_NOMAGAZINE))
-                make_magcache(cache);
+                (void) make_magcache(cache);
 
         /* Compute slab sizes, object counts in slabs etc. */
@@ -631 +634 @@
 
 /** Create slab cache  */
-slab_cache_t *
-slab_cache_create(char *name, size_t size, size_t align,
+slab_cache_t *slab_cache_create(const char *name, size_t size, size_t align,
     int (*constructor)(void *obj, int kmflag), int (*destructor)(void *obj),
     int flags)
@@ -853 +855 @@
                 cache = list_get_instance(cur, slab_cache_t, link);
 
-                char *name = cache->name;
+                const char *name = cache->name;
                 uint8_t order = cache->order;
                 size_t size = cache->size;
@@ -896 +898 @@
                     NULL, NULL, SLAB_CACHE_MAGDEFERRED);
         }
-#ifdef CONFIG_DEBUG       
+#ifdef CONFIG_DEBUG
         _slab_initialized = 1;
 #endif
@@ -925 +927 @@
                     SLAB_CACHE_MAGDEFERRED)
                         continue;
-                make_magcache(s);
+                (void) make_magcache(s);
                 s->flags &= ~SLAB_CACHE_MAGDEFERRED;
         }