Changeset 544a2e4 in mainline for kernel/generic/src/interrupt/interrupt.c

Timestamp:

2011-05-30T21:37:43Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7b712b60

Parents:

18ba2e4f (diff), 0743493a (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.

File:

• kernel/generic/src/interrupt/interrupt.c (modified) (1 diff)

kernel/generic/src/interrupt/interrupt.c

@@ -205 +205 @@
          * 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));
 }