Changeset ab6f2507 in mainline

Timestamp:

2011-01-13T17:52:46Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a613fea1

Parents:

014dd57b

Message:

Make sure that slab_reclaim() executes with interrupts disabled.
There is actually no need to explicitly disable interrupts for
slab_reclaim() in the calling function when it can do it itself.

File:

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

kernel/generic/src/mm/slab.c

@@ -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;