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

Timestamp:

2010-04-28T21:12:04Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

c050399

Parents:

b8f7ea78 (diff), 55821eea (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 blocking and locking improvements and fixes.

File:

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

kernel/generic/src/mm/slab.c

@@ -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;
 }
 
@@ -597 +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. */
@@ -923 +927 @@
                     SLAB_CACHE_MAGDEFERRED)
                         continue;
-                make_magcache(s);
+                (void) make_magcache(s);
                 s->flags &= ~SLAB_CACHE_MAGDEFERRED;
         }