Index: kernel/arch/amd64/src/mm/page.c
===================================================================
--- kernel/arch/amd64/src/mm/page.c	(revision 7d07bf31f74e2ee585ca017e2dccbd51c38cad08)
+++ kernel/arch/amd64/src/mm/page.c	(revision d8d542eaa92d9ef9f891917bf85c04abc6ef0751)
@@ -112,8 +112,8 @@
 
 		exc_register(14, "page_fault", (iroutine) page_fault);
-		write_cr3((uintptr_t) AS_KERNEL->page_table);
-	}
-	else {
-		write_cr3((uintptr_t) AS_KERNEL->page_table);
+		write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
+	}
+	else {
+		write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
 	}
 }
Index: kernel/arch/amd64/src/pm.c
===================================================================
--- kernel/arch/amd64/src/pm.c	(revision 7d07bf31f74e2ee585ca017e2dccbd51c38cad08)
+++ kernel/arch/amd64/src/pm.c	(revision d8d542eaa92d9ef9f891917bf85c04abc6ef0751)
@@ -202,5 +202,5 @@
 		 * non boot-mapped pointer, initialize the CR3 register
 		 * ahead of page_init */
-		write_cr3((uintptr_t) AS_KERNEL->page_table);
+		write_cr3((uintptr_t) AS_KERNEL->genarch.page_table);
 
 		tss_p = (struct tss *) malloc(sizeof(tss_t), FRAME_ATOMIC);