Index: generic/src/interrupt/interrupt.c
===================================================================
--- generic/src/interrupt/interrupt.c	(revision 0132630e277cac256d68387347726af617f4270d)
+++ generic/src/interrupt/interrupt.c	(revision edc89bd06235d952cbfa29940f60b97cb3bf9c02)
@@ -72,13 +72,13 @@
  * CPU is interrupts_disable()'d.
  */
-void exc_dispatch(int n, void *stack)
+void exc_dispatch(int n, istate_t *istate)
 {
 	ASSERT(n < IVT_ITEMS);
 	
-	exc_table[n].f(n + IVT_FIRST, stack);
+	exc_table[n].f(n + IVT_FIRST, istate);
 }
 
 /** Default 'null' exception handler */
-static void exc_undef(int n, void *stack)
+static void exc_undef(int n, istate_t *istate)
 {
 	panic("Unhandled exception %d.", n);
@@ -127,5 +127,5 @@
 
 	for (i=0;i < IVT_ITEMS; i++)
-		exc_register(i, "undef", exc_undef);
+		exc_register(i, "undef", (iroutine) exc_undef);
 
 	cmd_initialize(&exc_info);