crypto: x86/salsa20 - assembler cleanup, use ENTRY/ENDPROC for assember functions...

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/arch/x86/crypto/salsa20-i586-asm_32.S b/arch/x86/crypto/salsa20-i586-asm_32.S
index 72eb306680b2a42e666657b505692e5469e8055c..329452b8f79466eea6066ab6bcefa7981e4fd34e 100644 (file)
--- a/arch/x86/crypto/salsa20-i586-asm_32.S
+++ b/arch/x86/crypto/salsa20-i586-asm_32.S
@@ -2,11 +2,12 @@
 # D. J. Bernstein
 # Public domain.
 
-# enter ECRYPT_encrypt_bytes
+#include <linux/linkage.h>
+
 .text
-.p2align 5
-.globl ECRYPT_encrypt_bytes
-ECRYPT_encrypt_bytes:
+
+# enter salsa20_encrypt_bytes
+ENTRY(salsa20_encrypt_bytes)
        mov     %esp,%eax
        and     $31,%eax
        add     $256,%eax
@@ -933,11 +934,10 @@ ECRYPT_encrypt_bytes:
        add     $64,%esi
        # goto bytesatleast1
        jmp     ._bytesatleast1
-# enter ECRYPT_keysetup
-.text
-.p2align 5
-.globl ECRYPT_keysetup
-ECRYPT_keysetup:
+ENDPROC(salsa20_encrypt_bytes)
+
+# enter salsa20_keysetup
+ENTRY(salsa20_keysetup)
        mov     %esp,%eax
        and     $31,%eax
        add     $256,%eax
@@ -1060,11 +1060,10 @@ ECRYPT_keysetup:
        # leave
        add     %eax,%esp
        ret
-# enter ECRYPT_ivsetup
-.text
-.p2align 5
-.globl ECRYPT_ivsetup
-ECRYPT_ivsetup:
+ENDPROC(salsa20_keysetup)
+
+# enter salsa20_ivsetup
+ENTRY(salsa20_ivsetup)
        mov     %esp,%eax
        and     $31,%eax
        add     $256,%eax
@@ -1112,3 +1111,4 @@ ECRYPT_ivsetup:
        # leave
        add     %eax,%esp
        ret
+ENDPROC(salsa20_ivsetup)

diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
index 6214a9b09706c86f5894fff26061687d3684de17..9279e0b2d60ec85fc89f1c23cb7287f64531b4a0 100644 (file)
--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
@@ -1,8 +1,7 @@
-# enter ECRYPT_encrypt_bytes
-.text
-.p2align 5
-.globl ECRYPT_encrypt_bytes
-ECRYPT_encrypt_bytes:
+#include <linux/linkage.h>
+
+# enter salsa20_encrypt_bytes
+ENTRY(salsa20_encrypt_bytes)
        mov     %rsp,%r11
        and     $31,%r11
        add     $256,%r11
@@ -802,11 +801,10 @@ ECRYPT_encrypt_bytes:
        # comment:fp stack unchanged by jump
        # goto bytesatleast1
        jmp     ._bytesatleast1
-# enter ECRYPT_keysetup
-.text
-.p2align 5
-.globl ECRYPT_keysetup
-ECRYPT_keysetup:
+ENDPROC(salsa20_encrypt_bytes)
+
+# enter salsa20_keysetup
+ENTRY(salsa20_keysetup)
        mov     %rsp,%r11
        and     $31,%r11
        add     $256,%r11
@@ -892,11 +890,10 @@ ECRYPT_keysetup:
        mov     %rdi,%rax
        mov     %rsi,%rdx
        ret
-# enter ECRYPT_ivsetup
-.text
-.p2align 5
-.globl ECRYPT_ivsetup
-ECRYPT_ivsetup:
+ENDPROC(salsa20_keysetup)
+
+# enter salsa20_ivsetup
+ENTRY(salsa20_ivsetup)
        mov     %rsp,%r11
        and     $31,%r11
        add     $256,%r11
@@ -918,3 +915,4 @@ ECRYPT_ivsetup:
        mov     %rdi,%rax
        mov     %rsi,%rdx
        ret
+ENDPROC(salsa20_ivsetup)

diff --git a/arch/x86/crypto/salsa20_glue.c b/arch/x86/crypto/salsa20_glue.c
index a3a3c0205c16b4c31d549d3cca9b5d5c3297a0da..5e8e67739bb50a97c690139ff18517a2918d0386 100644 (file)
--- a/arch/x86/crypto/salsa20_glue.c
+++ b/arch/x86/crypto/salsa20_glue.c
@@ -26,11 +26,6 @@
 #define SALSA20_MIN_KEY_SIZE  16U
 #define SALSA20_MAX_KEY_SIZE  32U
 
-// use the ECRYPT_* function names
-#define salsa20_keysetup        ECRYPT_keysetup
-#define salsa20_ivsetup         ECRYPT_ivsetup
-#define salsa20_encrypt_bytes   ECRYPT_encrypt_bytes
-
 struct salsa20_ctx
 {
        u32 input[16];