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

[karo-tx-linux.git] / arch / x86 / crypto / twofish-x86_64-asm_64.S

diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
index 7bcf3fcc366839003db944ea5450c4c533d2a451..a039d21986a21c87e9bdf9a41117a726ea3bf77f 100644 (file)
--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
@@ -20,6 +20,7 @@
 .file "twofish-x86_64-asm.S"
 .text
 
+#include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 
 #define a_offset       0
@@ -214,11 +215,7 @@
        xor     %r8d,           d ## D;\
        ror     $1,             d ## D;
 
-.align 8
-.global twofish_enc_blk
-.global twofish_dec_blk
-
-twofish_enc_blk:
+ENTRY(twofish_enc_blk)
        pushq    R1
 
        /* %rdi contains the ctx address */
@@ -269,8 +266,9 @@ twofish_enc_blk:
        popq    R1
        movq    $1,%rax
        ret
+ENDPROC(twofish_enc_blk)
 
-twofish_dec_blk:
+ENTRY(twofish_dec_blk)
        pushq    R1
 
        /* %rdi contains the ctx address */
@@ -320,3 +318,4 @@ twofish_dec_blk:
        popq    R1
        movq    $1,%rax
        ret
+ENDPROC(twofish_dec_blk)