Changeset 25eec4e in mainline for kernel/generic/src/mm/page.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• kernel/generic/src/mm/page.c (modified) (3 diffs)

kernel/generic/src/mm/page.c

@@ -104 +104 @@
         ASSERT(page_mapping_operations->mapping_insert);
 
-        page_mapping_operations->mapping_insert(as, page, frame, flags);
+        page_mapping_operations->mapping_insert(as, ALIGN_DOWN(page, PAGE_SIZE),
+            ALIGN_DOWN(frame, FRAME_SIZE), flags);
         
         /* Repel prefetched accesses to the old mapping. */
@@ -127 +128 @@
         ASSERT(page_mapping_operations->mapping_remove);
         
-        page_mapping_operations->mapping_remove(as, page);
+        page_mapping_operations->mapping_remove(as,
+            ALIGN_DOWN(page, PAGE_SIZE));
         
         /* Repel prefetched accesses to the old mapping. */
@@ -150 +152 @@
         ASSERT(page_mapping_operations->mapping_find);
         
-        return page_mapping_operations->mapping_find(as, page, nolock);
+        return page_mapping_operations->mapping_find(as,
+            ALIGN_DOWN(page, PAGE_SIZE), nolock);
 }