Changeset 96cd5b4 in mainline for kernel/genarch/src/mm/page_ht.c

Timestamp:

2012-01-04T13:37:10Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

9957a97

Parents:

ecf823a (diff), c520034 (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 with mainline

File:

• kernel/genarch/src/mm/page_ht.c (modified) (5 diffs)

kernel/genarch/src/mm/page_ht.c

@@ -59 +59 @@
 static void ht_mapping_remove(as_t *, uintptr_t);
 static pte_t *ht_mapping_find(as_t *, uintptr_t, bool);
+static void ht_mapping_make_global(uintptr_t, size_t);
+
+slab_cache_t *pte_cache = NULL;
 
 /**
@@ -86 +89 @@
         .mapping_insert = ht_mapping_insert,
         .mapping_remove = ht_mapping_remove,
-        .mapping_find = ht_mapping_find
+        .mapping_find = ht_mapping_find,
+        .mapping_make_global = ht_mapping_make_global
 };
 
@@ -163 +167 @@
         pte_t *pte = hash_table_get_instance(item, pte_t, link);
         
-        free(pte);
+        slab_free(pte_cache, pte);
 }
 
@@ -188 +192 @@
         
         if (!hash_table_find(&page_ht, key)) {
-                pte_t *pte = (pte_t *) malloc(sizeof(pte_t), FRAME_ATOMIC);
+                pte_t *pte = slab_alloc(pte_cache, FRAME_LOWMEM | FRAME_ATOMIC);
                 ASSERT(pte != NULL);
                 
@@ -260 +264 @@
 }
 
+void ht_mapping_make_global(uintptr_t base, size_t size)
+{
+        /* nothing to do */
+}
+
 /** @}
  */