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

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

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 */