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

Timestamp:

2011-08-03T17:34:57Z (15 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 from mainline

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