diff options
| author | Jussi Kivilinna <jussi.kivilinna@mbnet.fi> | 2012-06-14 10:09:03 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2012-06-14 10:09:03 +0800 |
| commit | 3387e7d69048f5ab02729825f9611754850d9a87 (patch) | |
| tree | d7468f1d4a72dc1282a04c6f5bc5953be2b7bdad /arch/x86/crypto/serpent_avx_glue.c | |
| parent | d366db605c8c4a9878589bc4a87e55f6063184ac (diff) | |
| download | blackbird-op-linux-3387e7d69048f5ab02729825f9611754850d9a87.tar.gz blackbird-op-linux-3387e7d69048f5ab02729825f9611754850d9a87.zip | |
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/serpent_avx_glue.c')
| -rw-r--r-- | arch/x86/crypto/serpent_avx_glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/serpent_avx_glue.c b/arch/x86/crypto/serpent_avx_glue.c index 0dc7a26535e5..dd81bab4f11a 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> |
