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

Timestamp:

2014-09-12T13:22:33Z (11 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/sparc64/include/arch/context.h (modified) (2 diffs)

kernel/arch/sparc64/include/arch/context.h

@@ -37 +37 @@
 
 #include <arch/stack.h>
+#include <arch/context_struct.h>
 #include <typedefs.h>
 #include <align.h>
@@ -50 +51 @@
         } while (0)
 
-/*
- * Save only registers that must be preserved across
- * function calls.
- */
-typedef struct {
-        uintptr_t sp;           /* %o6 */
-        uintptr_t pc;           /* %o7 */
-        uint64_t i0;
-        uint64_t i1;
-        uint64_t i2;
-        uint64_t i3;
-        uint64_t i4;
-        uint64_t i5;
-        uintptr_t fp;           /* %i6 */
-        uintptr_t i7;
-        uint64_t l0;
-        uint64_t l1;
-        uint64_t l2;
-        uint64_t l3;
-        uint64_t l4;
-        uint64_t l5;
-        uint64_t l6;
-        uint64_t l7;
-        ipl_t ipl;
-} context_t;
-
 #endif