Index: kernel/arch/ia64/src/mm/as.c
===================================================================
--- kernel/arch/ia64/src/mm/as.c	(revision 1ac3a52793b357f936bd41ef49db586aa1e5c1a3)
+++ kernel/arch/ia64/src/mm/as.c	(revision 0ff9e67f7c2c8fa8131d075d54fd17e3dc98f207)
@@ -70,5 +70,8 @@
 		rr.word = rr_read(i);
 		rr.map.ve = false;		/* disable VHPT walker */
-		rr.map.rid = ASID2RID(as->asid, i);
+		if (as == AS_KERNEL)
+			rr.map.rid = RID_INVALID;
+		else
+			rr.map.rid = ASID2RID(as->asid, i);
 		rr.map.ps = PAGE_WIDTH;
 		rr_write(i, rr.word);
Index: kernel/arch/ia64/src/mm/page.c
===================================================================
--- kernel/arch/ia64/src/mm/page.c	(revision 1ac3a52793b357f936bd41ef49db586aa1e5c1a3)
+++ kernel/arch/ia64/src/mm/page.c	(revision 0ff9e67f7c2c8fa8131d075d54fd17e3dc98f207)
@@ -92,5 +92,5 @@
 		rr.word = rr_read(i);
 		rr.map.ve = 0;		/* disable VHPT walker */
-		rr.map.rid = RID_KERNEL;
+		rr.map.rid = RID_INVALID;
 		rr.map.ps = PAGE_WIDTH;
 		rr_write(i, rr.word);