Changeset 32573ff in mainline for kernel/arch/arm32/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/arm32/src/context.S (modified) (3 diffs)

kernel/arch/arm32/src/context.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
+
 .text   
 
-.global context_save_arch
-.global context_restore_arch
-
-context_save_arch:
+FUNCTION_BEGIN(context_save_arch)
         stmfd sp!, {r1}
         mrs r1, cpsr
@@ -44 +43 @@
         mov r0, #1
         mov pc, lr
+FUNCTION_END(context_save_arch)
 
-
-context_restore_arch:
+FUNCTION_BEGIN(context_restore_arch)
         ldmia r0!, {r4}
         mrs r5, cpsr
@@ -58 +57 @@
         mov r0, #0
         mov pc, lr
+FUNCTION_END(context_restore_arch)
+