Changeset eaeb056 in mainline for kernel/generic/src/mm/as.c

Timestamp:

2011-05-22T20:05:26Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

34efa8a

Parents:

9ea8fdb4 (diff), 2bdf8313 (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 from lp:~jakub/helenos/mm.

File:

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

kernel/generic/src/mm/as.c

@@ -649 +649 @@
                                 for (; i < size; i++) {
                                         pte_t *pte = page_mapping_find(as,
-                                            ptr + P2SZ(i));
+                                            ptr + P2SZ(i), false);
                                         
                                         ASSERT(pte);
@@ -798 +798 @@
                         for (size = 0; size < (size_t) node->value[i]; size++) {
                                 pte_t *pte = page_mapping_find(as,
-                                     ptr + P2SZ(size));
+                                     ptr + P2SZ(size), false);
                                 
                                 ASSERT(pte);
@@ -1105 +1105 @@
                         for (size = 0; size < (size_t) node->value[i]; size++) {
                                 pte_t *pte = page_mapping_find(as,
-                                    ptr + P2SZ(size));
+                                    ptr + P2SZ(size), false);
                                 
                                 ASSERT(pte);
@@ -1241 +1241 @@
          */
         pte_t *pte;
-        if ((pte = page_mapping_find(AS, page))) {
+        if ((pte = page_mapping_find(AS, page, false))) {
                 if (PTE_PRESENT(pte)) {
                         if (((access == PF_ACCESS_READ) && PTE_READABLE(pte)) ||