Changeset 32573ff in mainline for kernel/arch/ia64/src/dummy.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/dummy.S (moved) (moved from kernel/arch/sparc64/src/dummy.s ) (1 diff)

kernel/arch/ia64/src/dummy.S

@@ -27 +27 @@
 #
 
+#include <abi/asmtool.h>
+
 .text
 
-.global cpu_sleep
-.global sys_tls_set
+FUNCTION_BEGIN(calibrate_delay_loop)
+FUNCTION_BEGIN(asm_delay_loop)
+FUNCTION_BEGIN(cpu_sleep)
+        br.ret.sptk.many b0
+FUNCTION_END(calibrate_delay_loop)
+FUNCTION_END(asm_delay_loop)
+FUNCTION_END(cpu_sleep)
 
-.global dummy
-
-cpu_sleep:              ! not supported by architecture
-sys_tls_set:            ! not needed on architecture
-
-dummy:
-        retl
-        nop
-
-.global cpu_halt
-cpu_halt:
-        ba %xcc, cpu_halt
-        nop