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

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (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) (1 diff)

kernel/generic/include/mm/slab.h

@@ -111 +111 @@
         
         /* Slabs */
-        link_t full_slabs;     /**< List of full slabs */
-        link_t partial_slabs;  /**< List of partial slabs */
+        list_t full_slabs;     /**< List of full slabs */
+        list_t partial_slabs;  /**< List of partial slabs */
         SPINLOCK_DECLARE(slablock);
         /* Magazines */
-        link_t magazines;  /**< List o full magazines */
+        list_t magazines;  /**< List o full magazines */
         SPINLOCK_DECLARE(maglock);