summaryrefslogtreecommitdiffstats
path: root/arch/x86/crypto/camellia_aesni_avx2_glue.c
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2013-09-20 09:55:41 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2013-09-24 06:02:24 +1000
commit801201aa25646291aa87ba97250f6614639eb2ea (patch)
tree7088c2a5923546d325d42bbe024e693cdb3b76d8 /arch/x86/crypto/camellia_aesni_avx2_glue.c
parenta62b01cd6cc1feb5e80d64d6937c291473ed82cb (diff)
downloadblackbird-obmc-linux-801201aa25646291aa87ba97250f6614639eb2ea.tar.gz
blackbird-obmc-linux-801201aa25646291aa87ba97250f6614639eb2ea.zip
crypto: move x86 to the generic version of ablk_helper
Move all users of ablk_helper under x86/ to the generic version and delete the x86 specific version. Acked-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/x86/crypto/camellia_aesni_avx2_glue.c')
-rw-r--r--arch/x86/crypto/camellia_aesni_avx2_glue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/camellia_aesni_avx2_glue.c b/arch/x86/crypto/camellia_aesni_avx2_glue.c
index 414fe5d7946b..4209a76fcdaa 100644
--- a/arch/x86/crypto/camellia_aesni_avx2_glue.c
+++ b/arch/x86/crypto/camellia_aesni_avx2_glue.c
@@ -14,6 +14,7 @@
#include <linux/types.h>
#include <linux/crypto.h>
#include <linux/err.h>
+#include <crypto/ablk_helper.h>
#include <crypto/algapi.h>
#include <crypto/ctr.h>
#include <crypto/lrw.h>
@@ -21,7 +22,6 @@
#include <asm/xcr.h>
#include <asm/xsave.h>
#include <asm/crypto/camellia.h>
-#include <asm/crypto/ablk_helper.h>
#include <asm/crypto/glue_helper.h>
#define CAMELLIA_AESNI_PARALLEL_BLOCKS 16
OpenPOWER on IntegriCloud