Changeset 6843a9c in mainline for kernel/genarch/src/mm/as_ht.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• kernel/genarch/src/mm/as_ht.c (modified) (2 diffs)

kernel/genarch/src/mm/as_ht.c

@@ -41 +41 @@
 #include <mm/as.h>
 #include <mm/frame.h>
+#include <mm/slab.h>
 #include <typedefs.h>
 #include <memstr.h>
@@ -77 +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_t", sizeof(pte_t), 0,
+                    NULL, NULL, SLAB_CACHE_MAGDEFERRED);
         }