Changeset df29f24 in mainline for kernel/generic/src/mm/backend_anon.c

Timestamp:

2011-06-01T09:04:08Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0a7627b, c9f0975

Parents:

e51a514 (diff), 5d1b3aa (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

Conflicts - trivial to solve
In kernel/generic/src/mm/page.c - sys_page_find_mapping does
not use locking when accessing page tables (hope that is correct).

File:

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

kernel/generic/src/mm/backend_anon.c

@@ -50 +50 @@
 #include <typedefs.h>
 #include <align.h>
+#include <memstr.h>
 #include <arch.h>
 
@@ -121 +122 @@
                                 page_table_lock(area->as, false);
                                 pte = page_mapping_find(area->as,
-                                    base + j * PAGE_SIZE);
+                                    base + P2SZ(j), false);
                                 ASSERT(pte && PTE_VALID(pte) &&
                                     PTE_PRESENT(pte));
                                 btree_insert(&area->sh_info->pagemap,
-                                    (base + j * PAGE_SIZE) - area->base,
+                                    (base + P2SZ(j)) - area->base,
                                     (void *) PTE_GET_FRAME(pte), NULL);
                                 page_table_unlock(area->as, false);