Changeset 15d0046 in mainline for kernel/arch/ppc32/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/ppc32/include/arch/context.h (modified) (2 diffs)

kernel/arch/ppc32/include/arch/context.h

@@ -36 +36 @@
 #define KERN_ppc32_CONTEXT_H_
 
-#include <typedefs.h>
+#include <arch/context_struct.h>
 
 #define SP_DELTA  16
@@ -43 +43 @@
     context_set_generic(ctx, pc, stack, size)
 
-typedef struct {
-        uintptr_t sp;
-        uintptr_t pc;
-        
-        uint32_t r2;
-        uint32_t r13;
-        uint32_t r14;
-        uint32_t r15;
-        uint32_t r16;
-        uint32_t r17;
-        uint32_t r18;
-        uint32_t r19;
-        uint32_t r20;
-        uint32_t r21;
-        uint32_t r22;
-        uint32_t r23;
-        uint32_t r24;
-        uint32_t r25;
-        uint32_t r26;
-        uint32_t r27;
-        uint32_t r28;
-        uint32_t r29;
-        uint32_t r30;
-        uint32_t r31;
-        
-        uint32_t cr;
-        
-        ipl_t ipl;
-} __attribute__((packed)) context_t;
-
 #endif