Changeset eb083ad in mainline for kernel/generic/include/mm/slab.h

Timestamp:

2012-05-17T21:09:06Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

8fde078

Parents:

a8b8086 (diff), 3e67ab1 (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/include/mm/slab.h (modified) (2 diffs)

kernel/generic/include/mm/slab.h

@@ -81 +81 @@
         slab_magazine_t *current;
         slab_magazine_t *last;
-        SPINLOCK_DECLARE(lock);
+        IRQ_SPINLOCK_DECLARE(lock);
 } slab_mag_cache_t;
 
@@ -113 +113 @@
         list_t full_slabs;     /**< List of full slabs */
         list_t partial_slabs;  /**< List of partial slabs */
-        SPINLOCK_DECLARE(slablock);
+        IRQ_SPINLOCK_DECLARE(slablock);
         /* Magazines */
         list_t magazines;  /**< List o full magazines */
-        SPINLOCK_DECLARE(maglock);
+        IRQ_SPINLOCK_DECLARE(maglock);
         
         /** CPU cache */