Changeset bc73be3 in mainline for kernel/generic/src/ipc/ops/pagein.c

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• kernel/generic/src/ipc/ops/pagein.c (modified) (3 diffs)

kernel/generic/src/ipc/ops/pagein.c

@@ -68 +68 @@
                 return EOK;
 
-        if (!IPC_GET_RETVAL(answer->data)) {
+        if (!ipc_get_retval(&answer->data)) {
 
                 pte_t pte;
@@ -74 +74 @@
 
                 page_table_lock(AS, true);
-                bool found = page_mapping_find(AS, IPC_GET_ARG1(answer->data),
+                bool found = page_mapping_find(AS, ipc_get_arg1(&answer->data),
                     false, &pte);
                 if (found & PTE_PRESENT(&pte)) {
@@ -86 +86 @@
                                 frame_reference_add(ADDR2PFN(frame));
                         }
-                        IPC_SET_ARG1(answer->data, frame);
+                        ipc_set_arg1(&answer->data, frame);
                 } else {
-                        IPC_SET_RETVAL(answer->data, ENOENT);
+                        ipc_set_retval(&answer->data, ENOENT);
                 }
                 page_table_unlock(AS, true);