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

Timestamp:

2011-01-23T20:09:13Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

fdb9982c

Parents:

cead2aa (diff), 7e36c8d (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.

File:

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

kernel/generic/src/mm/slab.c

@@ -612 +612 @@
         cache->name = name;
         
-        if (align < sizeof(unative_t))
-                align = sizeof(unative_t);
+        if (align < sizeof(sysarg_t))
+                align = sizeof(sysarg_t);
         
         size = ALIGN_UP(size, align);
@@ -806 +806 @@
 }
 
-/** Go through all caches and reclaim what is possible
- *
- * Interrupts must be disabled before calling this function,
- * otherwise  memory allocation from interrupts can deadlock.
- *
- */
+/** Go through all caches and reclaim what is possible */
 size_t slab_reclaim(unsigned int flags)
 {
-        irq_spinlock_lock(&slab_cache_lock, false);
+        irq_spinlock_lock(&slab_cache_lock, true);
         
         size_t frames = 0;
@@ -824 +819 @@
         }
         
-        irq_spinlock_unlock(&slab_cache_lock, false);
+        irq_spinlock_unlock(&slab_cache_lock, true);
         
         return frames;