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

Timestamp:

2016-09-01T17:05:13Z (8 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/src/ipc/ops/pagein.c (modified) (1 diff)

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

@@ -47 +47 @@
 {
         if (!IPC_GET_RETVAL(answer->data)) {
-                pte_t *pte;
+                pte_t pte;
                 uintptr_t frame;
 
                 page_table_lock(AS, true);
-                pte = page_mapping_find(AS, IPC_GET_ARG1(answer->data), false);
-                if (pte) {
-                        frame = PTE_GET_FRAME(pte);
+                bool found = page_mapping_find(AS, IPC_GET_ARG1(answer->data),
+                    false, &pte);
+                if (found) {
+                        frame = PTE_GET_FRAME(&pte);
                         pfn_t pfn = ADDR2PFN(frame);
                         if (find_zone(pfn, 1, 0) != (size_t) -1) {