Changeset 850235d in mainline for kernel/arch/amd64/src/mm/page.c

Timestamp:

2013-03-10T14:56:21Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

05bab88

Parents:

ea906c29 (diff), 2277e03 (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 mainline changes

File:

• kernel/arch/amd64/src/mm/page.c (modified) (1 diff)

kernel/arch/amd64/src/mm/page.c

@@ -92 +92 @@
                 access = PF_ACCESS_READ;
         
-        if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
-                fault_if_from_uspace(istate, "Page fault: %p.", (void *) page);
-                panic_memtrap(istate, access, page, NULL);
-        }
+        as_page_fault(page, access, istate);
 }