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

kernel/arch/sparc64/src/sun4u/asm.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/arch.h>
 #include <arch/stack.h>
@@ -55 +56 @@
 .endm
 
-.global write_to_ag_g6
-write_to_ag_g6:
+FUNCTION_BEGIN(write_to_ag_g6)
         WRITE_ALTERNATE_REGISTER %g6, PSTATE_AG_BIT
+FUNCTION_END(write_to_ag_g6)
 
-.global write_to_ag_g7
-write_to_ag_g7:
+FUNCTION_BEGIN(write_to_ag_g7)
         WRITE_ALTERNATE_REGISTER %g7, PSTATE_AG_BIT
+FUNCTION_END(write_to_ag_g7)
 
-.global write_to_ig_g6
-write_to_ig_g6:
+FUNCTION_BEGIN(write_to_ig_g6)
         WRITE_ALTERNATE_REGISTER %g6, PSTATE_IG_BIT
+FUNCTION_END(write_to_ig_g6)
 
-.global read_from_ag_g6
-read_from_ag_g6:
+FUNCTION_BEGIN(read_from_ag_g6)
         READ_ALTERNATE_REGISTER %g6, PSTATE_AG_BIT
+FUNCTION_END(read_from_ag_g6)
 
-.global read_from_ag_g7
-read_from_ag_g7:
+FUNCTION_BEGIN(read_from_ag_g7)
         READ_ALTERNATE_REGISTER %g7, PSTATE_AG_BIT
+FUNCTION_END(read_from_ag_g7)
 
 /** Switch to userspace.
@@ -81 +82 @@
  * %o2  Userspace address of uarg structure.
  */
-.global switch_to_userspace
-switch_to_userspace:
+FUNCTION_BEGIN(switch_to_userspace)
         save %o1, -(STACK_WINDOW_SAVE_AREA_SIZE + STACK_ARG_SAVE_AREA_SIZE), %sp
         flushw
@@ -119 +119 @@
         
         done                            ! jump to userspace
+FUNCTION_END(switch_to_userspace)