Changeset 2a2fbc8 in mainline for kernel/generic/include/mm/page.h

Timestamp:

2016-09-01T17:05:13Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

42d08592

Parents:

f126c87 (diff), fb63c06 (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/pt

File:

• kernel/generic/include/mm/page.h (modified) (2 diffs)

kernel/generic/include/mm/page.h

@@ -48 +48 @@
         void (* mapping_insert)(as_t *, uintptr_t, uintptr_t, unsigned int);
         void (* mapping_remove)(as_t *, uintptr_t);
-        pte_t *(* mapping_find)(as_t *, uintptr_t, bool);
+        bool (* mapping_find)(as_t *, uintptr_t, bool, pte_t *);
+        void (* mapping_update)(as_t *, uintptr_t, bool, pte_t *);
         void (* mapping_make_global)(uintptr_t, size_t);
 } page_mapping_operations_t;
@@ -60 +61 @@
 extern void page_mapping_insert(as_t *, uintptr_t, uintptr_t, unsigned int);
 extern void page_mapping_remove(as_t *, uintptr_t);
-extern pte_t *page_mapping_find(as_t *, uintptr_t, bool);
+extern bool page_mapping_find(as_t *, uintptr_t, bool, pte_t *);
+extern void page_mapping_update(as_t *, uintptr_t, bool, pte_t *);
 extern void page_mapping_make_global(uintptr_t, size_t);
 extern pte_t *page_table_create(unsigned int);