Index: kernel/arch/amd64/src/mm/page.c
===================================================================
--- kernel/arch/amd64/src/mm/page.c	(revision 64f6ef041c53542ec74adf92465986abf208b1c3)
+++ kernel/arch/amd64/src/mm/page.c	(revision fe32163234401387c8b65d5b9fa81217da91da71)
@@ -89,7 +89,6 @@
 	
 	if (as_page_fault(page, access, istate) == AS_PF_FAULT) {
-		fault_if_from_uspace(istate, "Page fault: %p.", page);
-		decode_istate(n, istate);
-		panic("Page fault: %p", page);
+		fault_if_from_uspace(istate, "Page fault: %#x.", page);
+		panic_memtrap(istate, access, page, "Page fault.");
 	}
 }