Changeset 2c2d54a in mainline for kernel/generic/include

Timestamp:

2016-09-02T17:58:05Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4c3602c4

Parents:

4bf0926e (diff), 3233adb (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/pager

Location:

kernel/generic/include

Files:

• ipc/ipc.h (modified) (2 diffs)
• ipc/sysipc.h (modified) (1 diff)
• mm/as.h (modified) (3 diffs)
• mm/page.h (modified) (2 diffs)

kernel/generic/include/ipc/ipc.h

@@ -147 +147 @@
         struct task *sender;
         
+        /*
+         * Answerbox that will receive the answer.
+         * This will most of the times be the sender's answerbox,
+         * but we allow for useful exceptions.
+         */
+        answerbox_t *callerbox;
+
         /** Phone which was used to send the call. */
         phone_t *caller_phone;
@@ -172 +179 @@
 extern void ipc_call_release(call_t *);
 
+extern int ipc_call_sync(phone_t *, call_t *);
 extern int ipc_call(phone_t *, call_t *);
 extern call_t *ipc_wait_for_call(answerbox_t *, uint32_t, unsigned int);

kernel/generic/include/ipc/sysipc.h

@@ -40 +40 @@
 #include <typedefs.h>
 
+extern int ipc_req_internal(int, ipc_data_t *);
+
 extern sysarg_t sys_ipc_call_async_fast(sysarg_t, sysarg_t, sysarg_t,
     sysarg_t, sysarg_t, sysarg_t);

kernel/generic/include/mm/as.h

@@ -169 +169 @@
 /** Backend data stored in address space area. */
 typedef union mem_backend_data {
+        /* anon_backend members */
+        struct {
+        };
+
         /** elf_backend members */
         struct {
@@ -181 +185 @@
                 bool anonymous;
         };
+
+        /** user_backend members */
+        struct {
+                as_area_pager_info_t pager_info;
+        };
+
 } mem_backend_data_t;
 
@@ -296 +306 @@
 extern mem_backend_t elf_backend;
 extern mem_backend_t phys_backend;
+extern mem_backend_t user_backend;
 
 /* Address space area related syscalls. */
-extern sysarg_t sys_as_area_create(uintptr_t, size_t, unsigned int, uintptr_t);
+extern sysarg_t sys_as_area_create(uintptr_t, size_t, unsigned int, uintptr_t,
+    as_area_pager_info_t *);
 extern sysarg_t sys_as_area_resize(uintptr_t, size_t, unsigned int);
 extern sysarg_t sys_as_area_change_flags(uintptr_t, unsigned int);

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);