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

kernel/arch/sparc64/src/context.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/context_struct.h>
 #include <arch/arch.h>
@@ -33 +34 @@
 .text   
 
-.global context_save_arch
-.global context_restore_arch
-
 /*
  * context_save_arch() is required not to create its own stack frame. See the
  * generic context.h for explanation.
  */
-context_save_arch:
+FUNCTION_BEGIN(context_save_arch)
         #
         # Force all our active register windows to memory so that we can find
@@ -67 +65 @@
         retl
         mov 1, %o0              ! context_save_arch returns 1
+FUNCTION_END(context_save_arch)
 
-context_restore_arch:
+FUNCTION_BEGIN(context_restore_arch)
         #
         # Forget all previous windows, they are not going to be needed again.
@@ -106 +105 @@
         retl
         xor %o0, %o0, %o0       ! context_restore_arch returns 0
+FUNCTION_END(context_restore_arch)