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

Timestamp:

2011-08-03T17:34:57Z (14 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 from mainline

File:

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

kernel/generic/src/interrupt/interrupt.c

@@ -177 +177 @@
             (void *) istate_get_pc(istate));
         
+        istate_decode(istate);
         stack_trace_istate(istate);
         
@@ -205 +206 @@
          * 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));
 }