Changeset 25eec4e in mainline for kernel/arch/amd64/src/mm/page.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• kernel/arch/amd64/src/mm/page.c (modified) (2 diffs)

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

@@ -78 +78 @@
 void page_fault(unsigned int n, istate_t *istate)
 {
-        uintptr_t page = read_cr2();
+        uintptr_t badvaddr = read_cr2();
         
         if (istate->error_word & PFERR_CODE_RSVD)
@@ -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);
-        }
+        (void) as_page_fault(badvaddr, access, istate);
 }