xtensa: abstract 'entry' and 'retw' in assembly code

[linux-2.6-block.git] / arch / xtensa / lib / memset.S

diff --git a/arch/xtensa/lib/memset.S b/arch/xtensa/lib/memset.S
index 8632eacbdc8021a903a10d17d58a9dbc2de94439..59b1524fd601d175090ebe6f4bb3eb419b228e7d 100644 (file)
--- a/arch/xtensa/lib/memset.S
+++ b/arch/xtensa/lib/memset.S
@@ -34,7 +34,7 @@
 ENTRY(__memset)
 WEAK(memset)
 
-       entry   sp, 16          # minimal stack frame
+       abi_entry_default
        # a2/ dst, a3/ c, a4/ length
        extui   a3, a3, 0, 8    # mask to just 8 bits
        slli    a7, a3, 8       # duplicate character in all bytes of word
@@ -48,7 +48,7 @@ WEAK(memset)
        srli    a7, a4, 4       # number of loop iterations with 16B
                                # per iteration
        bnez    a4, .Laligned
-       retw
+       abi_ret_default
 
 /*
  * Destination is word-aligned.
@@ -95,7 +95,7 @@ EX(10f) s16i  a3, a5,  0
 EX(10f) s8i    a3, a5,  0
 .L5:
 .Lret1:
-       retw
+       abi_ret_default
 
 /*
  * Destination is unaligned
@@ -139,7 +139,7 @@ EX(10f) s8i a3, a5, 0
        blt     a5, a6, .Lbyteloop
 #endif /* !XCHAL_HAVE_LOOPS */
 .Lbytesetdone:
-       retw
+       abi_ret_default
 
 ENDPROC(__memset)
 
@@ -150,4 +150,4 @@ ENDPROC(__memset)
 
 10:
        movi    a2, 0
-       retw
+       abi_ret_default