Index: arch/ia64/include/interrupt.h
===================================================================
--- arch/ia64/include/interrupt.h	(revision 203dcd45d0ab1a42c96306e965756396de8dcec4)
+++ arch/ia64/include/interrupt.h	(revision cfffb000c1b414a3b483fb3d1b0ef9d245d2fa89)
@@ -109,5 +109,6 @@
 static inline void istate_set_retaddr(istate_t *istate, __address retaddr)
 {
-	/* TODO */
+	istate->cr_iip = retaddr;
+	istate->cr_ipsr.ri = 0;		/* return to instruction slot #0 */
 }
 
