Index: kernel/arch/amd64/include/interrupt.h
===================================================================
--- kernel/arch/amd64/include/interrupt.h	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/amd64/include/interrupt.h	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -112,5 +112,4 @@
 extern void (* eoi_function)(void);
 
-extern void decode_istate(istate_t *istate);
 extern void interrupt_init(void);
 extern void trap_virtual_enable_irqs(uint16_t irqmask);
Index: kernel/arch/amd64/src/interrupt.c
===================================================================
--- kernel/arch/amd64/src/interrupt.c	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/amd64/src/interrupt.c	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -63,5 +63,5 @@
 void (* eoi_function)(void) = NULL;
 
-void decode_istate(istate_t *istate)
+void istate_decode(istate_t *istate)
 {
 	printf("error_word=%#llx\n", istate->error_word);
Index: kernel/arch/arm32/include/exception.h
===================================================================
--- kernel/arch/arm32/include/exception.h	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/arm32/include/exception.h	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -141,5 +141,4 @@
 extern void install_exception_handlers(void);
 extern void exception_init(void);
-extern void decode_istate(istate_t *istate);
 extern void reset_exception_entry(void);
 extern void irq_exception_entry(void);
Index: kernel/arch/arm32/src/exception.c
===================================================================
--- kernel/arch/arm32/src/exception.c	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/arm32/src/exception.c	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -173,5 +173,5 @@
  * @param istate Structure to be printed.
  */
-void decode_istate(istate_t *istate)
+void istate_decode(istate_t *istate)
 {
 	printf("r0 =%#0.8lx\tr1 =%#0.8lx\tr2 =%#0.8lx\tr3 =%#0.8lx\n",
Index: kernel/arch/ia32/include/interrupt.h
===================================================================
--- kernel/arch/ia32/include/interrupt.h	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/ia32/include/interrupt.h	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -113,5 +113,4 @@
 extern void (* eoi_function)(void);
 
-extern void decode_istate(istate_t *istate);
 extern void interrupt_init(void);
 extern void trap_virtual_enable_irqs(uint16_t irqmask);
Index: kernel/arch/ia32/src/interrupt.c
===================================================================
--- kernel/arch/ia32/src/interrupt.c	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/ia32/src/interrupt.c	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -63,5 +63,5 @@
 void (* eoi_function)(void) = NULL;
 
-void decode_istate(istate_t *istate)
+void istate_decode(istate_t *istate)
 {
 	printf("error_word=%#lx\n", istate->error_word);
Index: kernel/arch/ia64/include/interrupt.h
===================================================================
--- kernel/arch/ia64/include/interrupt.h	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/ia64/include/interrupt.h	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -165,6 +165,4 @@
 extern void trap_virtual_enable_irqs(uint16_t irqmask);
 
-extern void decode_istate(istate_t *);
-
 #endif
 
Index: kernel/arch/ia64/src/interrupt.c
===================================================================
--- kernel/arch/ia64/src/interrupt.c	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/ia64/src/interrupt.c	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -133,5 +133,5 @@
 }
 
-void decode_istate(istate_t *istate)
+void istate_decode(istate_t *istate)
 {
 	printf("ar.bsp=%p\tar.bspstore=%p\n", istate->ar_bsp,
Index: kernel/arch/mips32/include/exception.h
===================================================================
--- kernel/arch/mips32/include/exception.h	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/mips32/include/exception.h	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -113,6 +113,4 @@
 extern void exception_init(void);
 
-extern void decode_istate(istate_t *);
-
 #endif
 
Index: kernel/arch/mips32/src/exception.c
===================================================================
--- kernel/arch/mips32/src/exception.c	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/mips32/src/exception.c	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -72,5 +72,5 @@
 };
 
-void decode_istate(istate_t *istate)
+void istate_decode(istate_t *istate)
 {
 	printf("at=%p\tv0=%p\tv1=%p\n", istate->at, istate->v0, istate->v1);
Index: kernel/arch/ppc32/include/exception.h
===================================================================
--- kernel/arch/ppc32/include/exception.h	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/ppc32/include/exception.h	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -106,6 +106,4 @@
 }
 
-extern void decode_istate(istate_t *);
-
 #endif
 
Index: kernel/arch/ppc32/src/interrupt.c
===================================================================
--- kernel/arch/ppc32/src/interrupt.c	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/ppc32/src/interrupt.c	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -52,5 +52,5 @@
 }
 
-void decode_istate(istate_t *istate)
+void istate_decode(istate_t *istate)
 {
 	printf("r0 =%p\tr1 =%p\tr2 =%p\n", istate->r0, istate->sp, istate->r2);
Index: kernel/arch/sparc64/include/interrupt.h
===================================================================
--- kernel/arch/sparc64/include/interrupt.h	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/sparc64/include/interrupt.h	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -76,6 +76,4 @@
 }
 
-extern void decode_istate(istate_t *);
-
 #endif
 
Index: kernel/arch/sparc64/src/trap/exception.c
===================================================================
--- kernel/arch/sparc64/src/trap/exception.c	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/arch/sparc64/src/trap/exception.c	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -44,5 +44,5 @@
 #include <symtab.h>
 
-void decode_istate(istate_t *istate)
+void istate_decode(istate_t *istate)
 {
 	const char *tpcs = symtab_fmt_name_lookup(istate->tpc);
Index: kernel/generic/include/interrupt.h
===================================================================
--- kernel/generic/include/interrupt.h	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/generic/include/interrupt.h	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -64,4 +64,6 @@
 extern void irq_initialize_arch(irq_t *);
 
+extern void istate_decode(istate_t *);
+
 #endif
 
Index: kernel/generic/src/debug/panic.c
===================================================================
--- kernel/generic/src/debug/panic.c	(revision 7008097ca6a0a187b98a9b23513d2488c87252d5)
+++ kernel/generic/src/debug/panic.c	(revision 22a28a696141d62f28e48ed72d1d255ff519795c)
@@ -81,5 +81,5 @@
 
 	if (istate) {
-		decode_istate(istate);
+		istate_decode(istate);
 		printf("\n");
 	}