Changeset 8b36bf2 in mainline for kernel/genarch/src/mm/as_ht.c

Timestamp:

2012-06-20T23:03:29Z (13 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

d5070ef

Parents:

8375d0eb (diff), 6eef3c4 (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/genarch/src/mm/as_ht.c (modified) (1 diff)

kernel/genarch/src/mm/as_ht.c

@@ -78 +78 @@
                 hash_table_create(&page_ht, PAGE_HT_ENTRIES, 2, &ht_operations);
                 mutex_initialize(&page_ht_lock, MUTEX_PASSIVE);
-                pte_cache = slab_cache_create("pte_cache", sizeof(pte_t), 0, NULL, NULL,
-                    SLAB_CACHE_MAGDEFERRED);
+                pte_cache = slab_cache_create("pte_t", sizeof(pte_t), 0,
+                    NULL, NULL, SLAB_CACHE_MAGDEFERRED);
         }