Changes in kernel/generic/src/interrupt/interrupt.c [e4d96e9:8f4f444] in mainline

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (3 diffs)

kernel/generic/src/interrupt/interrupt.c

@@ -54 +54 @@
 #include <proc/thread.h>
 #include <arch/cycle.h>
-#include <arch/stack.h>
 #include <str.h>
 #include <trace.h>
@@ -167 +166 @@
 }
 
-static NO_TRACE
-void fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
+static NO_TRACE void fault_from_uspace_core(istate_t *istate, const char *fmt, va_list args)
 {
         printf("Task %s (%" PRIu64 ") killed due to an exception at "
@@ -223 +221 @@
         /*
          * The istate structure should be right at the bottom of the kernel
-         * memory stack.
+         * stack.
          */
-        return (istate_t *) &thread->kstack[MEM_STACK_SIZE - sizeof(istate_t)];
+        return (istate_t *) ((uint8_t *)
+            thread->kstack + STACK_SIZE - sizeof(istate_t));
 }