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

kernel/arch/sparc64/src/dummy.S

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