Changes in kernel/arch/amd64/src/mm/page.c [59fb782:40c8c17] in mainline

File:

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

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

@@ -57 +57 @@
         uintptr_t cur;
         unsigned int identity_flags =
-            PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_EXEC | PAGE_WRITE | PAGE_READ;
+            PAGE_CACHEABLE | PAGE_EXEC | PAGE_GLOBAL | PAGE_WRITE;
                 
         page_mapping_operations = &pt_mapping_operations;
@@ -78 +78 @@
 void page_fault(unsigned int n, istate_t *istate)
 {
-        uintptr_t badvaddr = read_cr2();
+        uintptr_t page = read_cr2();
         
         if (istate->error_word & PFERR_CODE_RSVD)
@@ -92 +92 @@
                 access = PF_ACCESS_READ;
         
-        (void) as_page_fault(badvaddr, access, istate);
+        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);
+        }
 }