Changeset 32573ff in mainline for kernel/arch/mips32/src/context.S

Timestamp:

2016-05-02T20:58:16Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7c4b26c

Parents:

6adb775f (diff), 5035ba05 (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, which has dltest and fixes.

File:

• kernel/arch/mips32/src/context.S (modified) (4 diffs)

kernel/arch/mips32/src/context.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/context_struct.h>
 
@@ -35 +36 @@
 .set nomacro
 
-.global context_save_arch
-.global context_restore_arch
-
-context_save_arch:
+FUNCTION_BEGIN(context_save_arch)
         sw $s0, CONTEXT_OFFSET_S0($a0)
         sw $s1, CONTEXT_OFFSET_S1($a0)
@@ -56 +54 @@
         j $31
         li $2, 1
+FUNCTION_END(context_save_arch)
 
-context_restore_arch:
+FUNCTION_BEGIN(context_restore_arch)
         lw $s0, CONTEXT_OFFSET_S0($a0)
         lw $s1, CONTEXT_OFFSET_S1($a0)
@@ -75 +74 @@
         j $31
         xor $2, $2
+FUNCTION_END(context_restore_arch)