Index: 20071119-ia64/xen/arch/ia64/xen/ivt.S
===================================================================
--- 20071119-ia64.orig/xen/arch/ia64/xen/ivt.S	2007-11-25 21:39:17.000000000 -0700
+++ 20071119-ia64/xen/arch/ia64/xen/ivt.S	2007-11-25 21:39:37.000000000 -0700
@@ -115,35 +144,17 @@
 	DBG_FAULT(1)
 	mov r16 = cr.ifa
 	mov r31 = pr
-	;;
-	extr.u r17=r16,59,5
-	;;
 	/* If address belongs to VMM, go to alt tlb handler */
-	cmp.eq p6,p0=0x1e,r17
-(p6)	br.cond.spnt	late_alt_itlb_miss
-	// If it is an EFI address then must have XEN_EFI_RID set
-	// And if that is true, go to alt tlb handler
-	// (r17 == 0x18 && rr[6] == XEN_EFI_RID) ||
-	// (r17 == 0x1c && rr[7] == XEN_EFI_RID)
-	mov r23=6
-	mov r24=7
+	movl r26=itlb_miss_identity_map
+	movl r27=fast_tlb_miss_reflect
 	;;
-	mov r23=rr[r23]
-	mov r24=rr[r24]
-	;;
-	mov r25=XEN_EFI_RID
-	cmp.eq p8,p0=0x18,r17		// 0xc...
-	cmp.eq p9,p0=0x1c,r17		// 0xe...
+	br.cond.spnt branch_on_xen_memory
 	;;
-	cmp.ne.and p8,p0=r25,r23	// rr[6] == XEN_EFI_RID
-	cmp.ne.and p9,p0=r25,r24	// rr[7] == XEN_EFI_RID
-	;;
-(p8)	br.cond.spnt fast_tlb_miss_reflect
-(p9)	br.cond.spnt fast_tlb_miss_reflect
-
-	// EFI PAGE size is IA64_GRANULE_SIZE
-	// itir's key should be 0, as should the reserved space
-	// thus we can just set itir = (IA64_GRANULE_SHIFT << 2)
+itlb_miss_identity_map:
+	/* EFI PAGE size is IA64_GRANULE_SIZE
+	 * itir's key should be 0, as should the reserved space
+	 * thus we can just set itir = (IA64_GRANULE_SHIFT << 2)
+	 */
 	movl r20=IA64_GRANULE_SHIFT
 	;;
 	shl r20=r20,2