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

kernel/arch/ia64/src/asm.S

@@ -27 +27 @@
  */
 
+#include <abi/asmtool.h>
 #include <arch/register.h>
 
 .text
-.global memcpy_from_uspace
-.global memcpy_to_uspace
-.global memcpy_from_uspace_failover_address
-.global memcpy_to_uspace_failover_address
 
 /** Copy memory from/to userspace.
@@ -46 +43 @@
  *
  */
-memcpy_from_uspace:
-memcpy_to_uspace:
+FUNCTION_BEGIN(memcpy_from_uspace)
+FUNCTION_BEGIN(memcpy_to_uspace)
         alloc loc0 = ar.pfs, 3, 1, 0, 0
         
@@ -132 +129 @@
                 mov ar.pfs = loc0
                 br.ret.sptk.many rp
+FUNCTION_END(memcpy_from_uspace)
+FUNCTION_END(memcpy_to_uspace)
 
-memcpy_from_uspace_failover_address:
-memcpy_to_uspace_failover_address:
+SYMBOL(memcpy_from_uspace_failover_address)
+SYMBOL(memcpy_to_uspace_failover_address)
         /* Return 0 on failure */
         mov r8 = r0
@@ -140 +139 @@
         br.ret.sptk.many rp
 
-.global cpu_halt
-cpu_halt:
+FUNCTION_BEGIN(cpu_halt)
         br cpu_halt
+FUNCTION_END(cpu_halt)
 
 /** Switch to userspace - low level code.
@@ -154 +153 @@
  *
  */
-.global switch_to_userspace
-switch_to_userspace:
+FUNCTION_BEGIN(switch_to_userspace)
         alloc loc0 = ar.pfs, 6, 3, 0, 0
         
@@ -191 +189 @@
         
         rfi ;;
+FUNCTION_END(switch_to_userspace)
 
-.global early_putchar
-early_putchar:
+FUNCTION_BEGIN(early_putchar)
         br.ret.sptk.many b0
+FUNCTION_END(early_putchar)