Index: kernel/generic/src/interrupt/interrupt.c
===================================================================
--- kernel/generic/src/interrupt/interrupt.c	(revision 5bcf1f9bc844ed807e0697b24feb36afeff99d8a)
+++ kernel/generic/src/interrupt/interrupt.c	(revision 13f2461548be9766ca2b1b38b05f43028fd2a58f)
@@ -205,6 +205,6 @@
 	 * stack.
 	 */
-	return (istate_t *) ((uint8_t *) thread->kstack + THREAD_STACK_SIZE -
-	    sizeof(istate_t));
+	return (istate_t *) ((uint8_t *)
+	    thread->kstack + STACK_SIZE - sizeof(istate_t));
 }