Index: xen-unstable.hg/xen/arch/ia64/linux-xen/head.S
===================================================================
--- xen-unstable.hg.orig/xen/arch/ia64/linux-xen/head.S	2007-12-05 19:52:08.000000000 +0900
+++ xen-unstable.hg/xen/arch/ia64/linux-xen/head.S	2007-12-05 19:53:49.000000000 +0900
@@ -266,7 +266,8 @@ start_ap:
 	;;
 	/* XEN HEAP is identity mapped */
 	mov r16 = IA64_TR_XEN_HEAP_REGS
-	dep r17 = -1, r2, 60, 4
+	// XXX: Fixme: Should be generated (as it was before I added this)
+	movl r17 = XEN_HEAP_ADDR
 	;;
 	mov cr.ifa = r17
 	;;
Index: xen-unstable.hg/xen/arch/ia64/vmx/vmx_entry.S
===================================================================
--- xen-unstable.hg.orig/xen/arch/ia64/vmx/vmx_entry.S	2007-12-05 19:52:08.000000000 +0900
+++ xen-unstable.hg/xen/arch/ia64/vmx/vmx_entry.S	2007-12-05 19:53:45.000000000 +0900
@@ -687,7 +687,8 @@ GLOBAL_ENTRY(vmx_switch_rr7)
    ;;
    /* xen heap is also identity mapped */
    mov r16 = IA64_TR_XEN_HEAP_REGS
-   dep r17=-1,r3,60,4
+   // XXX: Fixme: Should be generated (as it was before I added this)
+   movl r17 = XEN_HEAP_ADDR
    ;;
    ptr.d r17, r18
    ;;
Index: xen-unstable.hg/xen/arch/ia64/xen/xenasm.S
===================================================================
--- xen-unstable.hg.orig/xen/arch/ia64/xen/xenasm.S	2007-12-05 19:52:08.000000000 +0900
+++ xen-unstable.hg/xen/arch/ia64/xen/xenasm.S	2007-12-05 19:54:35.000000000 +0900
@@ -95,7 +95,8 @@ GLOBAL_ENTRY(ia64_new_rr7)
 	;;
 	/* xen heap is also identity mapped */
 	mov r16 = IA64_TR_XEN_HEAP_REGS  
-	dep r17=-1,loc6,60,4
+	// XXX: Fixme: Should be generated (as it was before I added this)
+	movl r17 = XEN_HEAP_ADDR
 	;;
 	ptr.d r17,r24
 	;;