Changeset 97c7682 in mainline for kernel/genarch/src/mm/as_ht.c

Timestamp:

2012-07-14T11:18:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

804d9b6

Parents:

0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

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