Changeset 90478727 in mainline for kernel/generic/src/adt/btree.c

Timestamp:

2012-08-12T11:46:44Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

41b764b7

Parents:

e1e4192 (diff), 371cb6c (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/src/adt/btree.c (modified) (1 diff)

kernel/generic/src/adt/btree.c

@@ -71 +71 @@
 void btree_init(void)
 {
-        btree_node_slab = slab_cache_create("btree_node_slab",
+        btree_node_slab = slab_cache_create("btree_node_t",
             sizeof(btree_node_t), 0, NULL, NULL, SLAB_CACHE_MAGDEFERRED);
 }