Index: kernel/genarch/src/mm/as_pt.c
===================================================================
--- kernel/genarch/src/mm/as_pt.c	(revision b3f8fb771f871e7f2bb35ce9339717639e8f86d6)
+++ kernel/genarch/src/mm/as_pt.c	(revision cf5ddf618974e3d854b08c9d0db88f2ad90fee8c)
@@ -86,5 +86,5 @@
 		ipl = interrupts_disable();
 		mutex_lock(&AS_KERNEL->lock);		
-		src_ptl0 = (pte_t *) PA2KA((uintptr_t) AS_KERNEL->page_table);
+		src_ptl0 = (pte_t *) PA2KA((uintptr_t) AS_KERNEL->genarch.page_table);
 
 		src = (uintptr_t) &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)];
Index: kernel/genarch/src/mm/page_pt.c
===================================================================
--- kernel/genarch/src/mm/page_pt.c	(revision b3f8fb771f871e7f2bb35ce9339717639e8f86d6)
+++ kernel/genarch/src/mm/page_pt.c	(revision cf5ddf618974e3d854b08c9d0db88f2ad90fee8c)
@@ -73,5 +73,5 @@
 	pte_t *newpt;
 
-	ptl0 = (pte_t *) PA2KA((uintptr_t) as->page_table);
+	ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
 
 	if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) {
@@ -129,5 +129,5 @@
 	 */
 
-	ptl0 = (pte_t *) PA2KA((uintptr_t) as->page_table);
+	ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
 
 	if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)
@@ -245,5 +245,5 @@
 	pte_t *ptl0, *ptl1, *ptl2, *ptl3;
 
-	ptl0 = (pte_t *) PA2KA((uintptr_t) as->page_table);
+	ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table);
 
 	if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT)