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

kernel/arch/ia64/src/context.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
 #include <arch/context_struct.h>
 
 .text
 
-.global context_save_arch
-.global context_restore_arch
-
-context_save_arch:
+FUNCTION_BEGIN(context_save_arch)
         alloc loc0 = ar.pfs, 1, 49, 0, 0
         mov loc1 = ar.unat ;;
@@ -182 +180 @@
         add r8 = r0, r0, 1      /* context_save returns 1 */
         br.ret.sptk.many b0
-
-context_restore_arch:
+FUNCTION_END(context_save_arch)
+
+FUNCTION_BEGIN(context_restore_arch)
         alloc loc0 = ar.pfs, 1, 50, 0, 0        ;;
 
@@ -338 +337 @@
         mov r8 = r0                     /* context_restore returns 0 */
         br.ret.sptk.many b0
-
+FUNCTION_END(context_restore_arch)
+