Changeset bd08239 in mainline for kernel/generic/include/mm

Timestamp:

2011-06-18T15:35:25Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

44e2c1a

Parents:

313775b (diff), adfdbd5 (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

Location:

kernel/generic/include/mm

Files:

• as.h (modified) (1 diff)
• buddy.h (modified) (1 diff)
• slab.h (modified) (1 diff)

kernel/generic/include/mm/as.h

@@ -254 +254 @@
 
 extern as_operations_t *as_operations;
-extern link_t inactive_as_with_asid_head;
+extern list_t inactive_as_with_asid_list;
 
 extern void as_init(void);

kernel/generic/include/mm/buddy.h

@@ -72 +72 @@
         /** Maximal order of block which can be stored by buddy system. */
         uint8_t max_order;
-        link_t *order;
+        list_t *order;
         buddy_system_operations_t *op;
         /** Pointer to be used by the implementation. */

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