Changeset 25eec4e in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline chages.

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>
@@ -166 +167 @@
 }
 
-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 "
@@ -221 +223 @@
         /*
          * The istate structure should be right at the bottom of the kernel
-         * stack.
+         * memory stack.
          */
-        return (istate_t *) ((uint8_t *)
-            thread->kstack + STACK_SIZE - sizeof(istate_t));
+        return (istate_t *) &thread->kstack[MEM_STACK_SIZE - sizeof(istate_t)];
 }