Merge tag 'for-linville-20130318' of git://github.com/kvalo/ath6kl

[karo-tx-linux.git] / arch / x86 / crypto / twofish-i586-asm_32.S

diff --git a/arch/x86/crypto/twofish-i586-asm_32.S b/arch/x86/crypto/twofish-i586-asm_32.S
index 658af4bb35c9ff852033d0f4858824e92d4f623b..694ea4587ba7dfbc48ebad41c10e0f1ee53f2327 100644 (file)
--- a/arch/x86/crypto/twofish-i586-asm_32.S
+++ b/arch/x86/crypto/twofish-i586-asm_32.S
@@ -20,6 +20,7 @@
 .file "twofish-i586-asm.S"
 .text
 
+#include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 
 /* return address at 0 */
@@ -219,11 +220,7 @@
        xor     %esi,           d ## D;\
        ror     $1,             d ## D;
 
-.align 4
-.global twofish_enc_blk
-.global twofish_dec_blk
-
-twofish_enc_blk:
+ENTRY(twofish_enc_blk)
        push    %ebp                    /* save registers according to calling convention*/
        push    %ebx
        push    %esi
@@ -277,8 +274,9 @@ twofish_enc_blk:
        pop     %ebp
        mov     $1,     %eax
        ret
+ENDPROC(twofish_enc_blk)
 
-twofish_dec_blk:
+ENTRY(twofish_dec_blk)
        push    %ebp                    /* save registers according to calling convention*/
        push    %ebx
        push    %esi
@@ -333,3 +331,4 @@ twofish_dec_blk:
        pop     %ebp
        mov     $1,     %eax
        ret
+ENDPROC(twofish_dec_blk)