Index: 20071119-ia64/xen/arch/ia64/xen/ivt.S
===================================================================
--- 20071119-ia64.orig/xen/arch/ia64/xen/ivt.S	2007-11-25 22:01:47.000000000 -0700
+++ 20071119-ia64/xen/arch/ia64/xen/ivt.S	2007-11-25 22:02:14.000000000 -0700
@@ -225,13 +277,8 @@
 	;;
 late_alt_dtlb_miss:
 	mov r20=cr.isr
-	cmp.eq p6,p0=0x18,r22   // address == 0xe...
-	cmp.eq p7,p0=0x1c,r22   // address == 0xf...
-	movl r17=PAGE_KERNEL
 	mov r21=cr.ipsr
 	;;
-(p6)	movl r17=(__DIRTY_BITS | _PAGE_AR_RWX | _PAGE_PL_PRIV | _PAGE_MA_UC)
-(p7)	movl r17=(__DIRTY_BITS | _PAGE_AR_RWX)
 	movl r19=(((1 << IA64_MAX_PHYS_BITS) - 1) & ~0xfff)
 	;;
 	extr.u r23=r21,IA64_PSR_CPL0_BIT,2	// extract psr.cpl
@@ -242,11 +289,6 @@
 						//   PTE control bits
 	tbit.nz p9,p0=r20,IA64_ISR_NA_BIT	// is non-access bit on?
 	;;
-	movl r20=(PAGE_SHIFT << 2)
-	;;
-(p6)	movl r20=(IA64_GRANULE_SHIFT << 2)
-(p7)	movl r20=(IA64_GRANULE_SHIFT << 2)
-	;;
 	cmp.ne p8,p0=r0,r23
 (p9)	cmp.eq.or.andcm p6,p7=IA64_ISR_CODE_LFETCH,r22	// check isr.code field
 (p8)	br.cond.spnt page_fault
@@ -260,7 +302,7 @@
 	movl r26=alt_dtlb_miss_identity_map
 	movl r27=page_fault
 	;;
-	br.cond.spnt branch_on_xen_memory
+	br.cond.spnt branch_on_xen_memory2
 	;;
 alt_dtlb_miss_identity_map:
 	dep r21=-1,r21,IA64_PSR_ED_BIT,1