Changeset db71e2a in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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 changes.

usb hc macro changes from mainline were reverted, too many conflicts

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (2 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>
@@ -222 +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)];
 }