Changes in kernel/generic/src/mm/backend_anon.c [55b77d9:cda1378] in mainline

File:

• kernel/generic/src/mm/backend_anon.c (modified) (4 diffs)

kernel/generic/src/mm/backend_anon.c

@@ -50 +50 @@
 #include <typedefs.h>
 #include <align.h>
-#include <memstr.h>
 #include <arch.h>
 
@@ -97 +96 @@
 void anon_share(as_area_t *area)
 {
+        link_t *cur;
+
         ASSERT(mutex_locked(&area->as->lock));
         ASSERT(mutex_locked(&area->lock));
@@ -104 +105 @@
          */
         mutex_lock(&area->sh_info->lock);
-        list_foreach(area->used_space.leaf_list, cur) {
+        for (cur = area->used_space.leaf_head.next;
+            cur != &area->used_space.leaf_head; cur = cur->next) {
                 btree_node_t *node;
                 unsigned int i;
@@ -119 +121 @@
                                 page_table_lock(area->as, false);
                                 pte = page_mapping_find(area->as,
-                                    base + P2SZ(j), false);
+                                    base + j * PAGE_SIZE);
                                 ASSERT(pte && PTE_VALID(pte) &&
                                     PTE_PRESENT(pte));
                                 btree_insert(&area->sh_info->pagemap,
-                                    (base + P2SZ(j)) - area->base,
+                                    (base + j * PAGE_SIZE) - area->base,
                                     (void *) PTE_GET_FRAME(pte), NULL);
                                 page_table_unlock(area->as, false);