Index: arch/amd64/src/interrupt.c
===================================================================
--- arch/amd64/src/interrupt.c	(revision fcfac420803a43318bce80248d718b848e2bcaa3)
+++ arch/amd64/src/interrupt.c	(revision 13fded3cce867db5468e1ff56db5579e305d2120)
@@ -36,4 +36,5 @@
 #include <arch/asm.h>
 #include <mm/tlb.h>
+#include <mm/as.h>
 #include <arch.h>
 #include <symtab.h>
@@ -125,11 +126,14 @@
 }
 
-
-
 void page_fault(int n, void *stack)
 {
-	print_info_errcode(n,stack);
-	printf("Page fault address: %Q\n", read_cr2());
-	panic("page fault\n");
+	__address page;
+	
+	page = read_cr2();
+	if (!as_page_fault(page)) {
+		print_info_errcode(n,stack);
+		printf("Page fault address: %Q\n", page);
+		panic("page fault\n");
+	}
 }