Changeset fd608dc in mainline for kernel/arch/arm32/include/exception.h

Timestamp:

2010-01-13T17:52:13Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

65737d4, 990c70e

Parents:

439ba77 (diff), 15817089 (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 the stacktrace branch.

This merge introduces support for kernel stack traces on arm32.

File:

• kernel/arch/arm32/include/exception.h (modified) (2 diffs)

kernel/arch/arm32/include/exception.h

@@ -102 +102 @@
         uint32_t r9;
         uint32_t r10;
-        uint32_t r11;
+        uint32_t fp;
         uint32_t r12;
 
@@ -135 +135 @@
 static inline unative_t istate_get_fp(istate_t *istate)
 {
-        return istate->r11;
+        return istate->fp;
 }