summaryrefslogtreecommitdiffstats
path: root/arch/x86/crypto
diff options
context:
space:
mode:
authorJussi Kivilinna <jussi.kivilinna@mbnet.fi>2012-06-14 10:09:03 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2012-06-14 10:09:03 +0800
commit3387e7d69048f5ab02729825f9611754850d9a87 (patch)
treed7468f1d4a72dc1282a04c6f5bc5953be2b7bdad /arch/x86/crypto
parentd366db605c8c4a9878589bc4a87e55f6063184ac (diff)
downloadop-kernel-dev-3387e7d69048f5ab02729825f9611754850d9a87.zip
op-kernel-dev-3387e7d69048f5ab02729825f9611754850d9a87.tar.gz
crypto: serpent-sse2/avx - allow both to be built into kernel
Rename serpent-avx assembler functions so that they do not collide with serpent-sse2 assembler functions when linking both versions in to same kernel image. Reported-by: Randy Dunlap <rdunlap@xenotime.net> Cc: Johannes Goetzfried <Johannes.Goetzfried@informatik.stud.uni-erlangen.de> Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/crypto')
-rw-r--r--arch/x86/crypto/serpent-avx-x86_64-asm_64.S12
-rw-r--r--arch/x86/crypto/serpent_avx_glue.c2
-rw-r--r--arch/x86/crypto/serpent_sse2_glue.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
index 0ed47a1..504106b 100644
--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
@@ -579,10 +579,10 @@
vmovdqu x3, (3*4*4)(out);
.align 8
-.global __serpent_enc_blk_8way
-.type __serpent_enc_blk_8way,@function;
+.global __serpent_enc_blk_8way_avx
+.type __serpent_enc_blk_8way_avx,@function;
-__serpent_enc_blk_8way:
+__serpent_enc_blk_8way_avx:
/* input:
* %rdi: ctx, CTX
* %rsi: dst
@@ -647,10 +647,10 @@ __enc_xor8:
ret;
.align 8
-.global serpent_dec_blk_8way
-.type serpent_dec_blk_8way,@function;
+.global serpent_dec_blk_8way_avx
+.type serpent_dec_blk_8way_avx,@function;
-serpent_dec_blk_8way:
+serpent_dec_blk_8way_avx:
/* input:
* %rdi: ctx, CTX
* %rsi: dst
diff --git a/arch/x86/crypto/serpent_avx_glue.c b/arch/x86/crypto/serpent_avx_glue.c
index 0dc7a26..dd81bab 100644
--- a/arch/x86/crypto/serpent_avx_glue.c
+++ b/arch/x86/crypto/serpent_avx_glue.c
@@ -39,7 +39,7 @@
#include <asm/i387.h>
#include <asm/xcr.h>
#include <asm/xsave.h>
-#include <asm/serpent.h>
+#include <asm/serpent-avx.h>
#include <crypto/scatterwalk.h>
#include <linux/workqueue.h>
#include <linux/spinlock.h>
diff --git a/arch/x86/crypto/serpent_sse2_glue.c b/arch/x86/crypto/serpent_sse2_glue.c
index 4b21be8..deecd25 100644
--- a/arch/x86/crypto/serpent_sse2_glue.c
+++ b/arch/x86/crypto/serpent_sse2_glue.c
@@ -42,7 +42,7 @@
#include <crypto/lrw.h>
#include <crypto/xts.h>
#include <asm/i387.h>
-#include <asm/serpent.h>
+#include <asm/serpent-sse2.h>
#include <crypto/scatterwalk.h>
#include <linux/workqueue.h>
#include <linux/spinlock.h>
OpenPOWER on IntegriCloud