Changeset 15d0046 in mainline for kernel/arch/arm32/include/arch/context.h

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (diff), 105d8d6 (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/arch/arm32/include/arch/context.h (modified) (2 diffs)

kernel/arch/arm32/include/arch/context.h

@@ -39 +39 @@
 #include <align.h>
 #include <arch/stack.h>
+#include <arch/context_struct.h>
 
 /* Put one item onto the stack to support get_stack_base() and align it up. */
@@ -52 +53 @@
 #ifndef __ASM__
 
-#include <typedefs.h>
-
-/** Thread context containing registers that must be preserved across function
- * calls.
- */
-typedef struct {
-        uint32_t cpu_mode;
-        uintptr_t sp;
-        uintptr_t pc;
-        
-        uint32_t r4;
-        uint32_t r5;
-        uint32_t r6;
-        uint32_t r7;
-        uint32_t r8;
-        uint32_t r9;
-        uint32_t r10;
-        uint32_t fp;    /* r11 */
-        
-        ipl_t ipl;
-} context_t;
-
-
 #endif /* __ASM__ */