Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / arch / x86 / crypto / twofish-x86_64-asm_64-3way.S

diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
index 5b012a2..1c3b7ce 100644 (file)
--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
@@ -20,6 +20,8 @@
  *
  */
 
+#include <linux/linkage.h>
+
 .file "twofish-x86_64-asm-3way.S"
 .text
 
@@ -214,11 +216,7 @@
        rorq $32,                       RAB2; \
        outunpack3(mov, RIO, 2, RAB, 2);
 
-.align 8
-.global __twofish_enc_blk_3way
-.type   __twofish_enc_blk_3way,@function;
-
-__twofish_enc_blk_3way:
+ENTRY(__twofish_enc_blk_3way)
        /* input:
         *      %rdi: ctx, CTX
         *      %rsi: dst
@@ -250,7 +248,7 @@ __twofish_enc_blk_3way:
        popq %rbp; /* bool xor */
 
        testb %bpl, %bpl;
-       jnz __enc_xor3;
+       jnz .L__enc_xor3;
 
        outunpack_enc3(mov);
 
@@ -262,7 +260,7 @@ __twofish_enc_blk_3way:
        popq %r15;
        ret;
 
-__enc_xor3:
+.L__enc_xor3:
        outunpack_enc3(xor);
 
        popq %rbx;
@@ -272,11 +270,9 @@ __enc_xor3:
        popq %r14;
        popq %r15;
        ret;
+ENDPROC(__twofish_enc_blk_3way)
 
-.global twofish_dec_blk_3way
-.type   twofish_dec_blk_3way,@function;
-
-twofish_dec_blk_3way:
+ENTRY(twofish_dec_blk_3way)
        /* input:
         *      %rdi: ctx, CTX
         *      %rsi: dst
@@ -313,4 +309,4 @@ twofish_dec_blk_3way:
        popq %r14;
        popq %r15;
        ret;
-
+ENDPROC(twofish_dec_blk_3way)