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

Timestamp:

2018-01-31T12:02:00Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• kernel/generic/include/mm/page.h (modified) (1 diff)

kernel/generic/include/mm/page.h

@@ -46 +46 @@
 /** Operations to manipulate page mappings. */
 typedef struct {
-        void (* mapping_insert)(as_t *, uintptr_t, uintptr_t, unsigned int);
-        void (* mapping_remove)(as_t *, uintptr_t);
-        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);
+        void (*mapping_insert)(as_t *, uintptr_t, uintptr_t, unsigned int);
+        void (*mapping_remove)(as_t *, uintptr_t);
+        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;