Index: xen-unstable.hg/xen/arch/ia64/xen/ivt.S
===================================================================
--- xen-unstable.hg.orig/xen/arch/ia64/xen/ivt.S	2007-12-06 16:51:01.000000000 +0900
+++ xen-unstable.hg/xen/arch/ia64/xen/ivt.S	2007-12-06 16:52:06.000000000 +0900
@@ -211,23 +211,15 @@ late_alt_dtlb_miss:
 (p8)	br.cond.sptk frametable_miss ;;
 #endif
 	// If it is not a Xen address, handle it via page_fault.
-	//    !( ((r22 == 0x18 || r22 == 0x1c) && rr6 == XEN_EFI_RID) ||
-	//	 r22 == 0x1e )
-	// Note that rr6 == XEN_EFI_RID implies rr7 == XEN_EFI_RID
+	//    !( r22 == 0x18 || r22 == 0x1c || r22 == 0x1e )
 	extr.u r22=r16,59,5
 	;;
 	dep r20=0,r20,IA64_ITIR_KEY,IA64_ITIR_KEY_LEN	// clear the key
-	movl r23=6 << 61
 	;;
-	mov r23=rr[r23]
-	;;
-	mov r25=XEN_EFI_RID
 	cmp.eq p8,p0=0x18,r22		// 0xc...
 	;;
 	cmp.eq.or p8,p0=0x1c,r22	// 0xe...
 	;;
-	cmp.eq.and p8,p0=r25,r23	// rr6 == XEN_EFI_RID
-	;;
 	cmp.eq.or p8,p0=0x1e,r22	// 0xf...
 	;;
 (p8)	br.cond.spnt alt_dtlb_miss_identity_map