diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2013-09-20 03:55:41 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2013-09-23 16:02:24 -0400 |
| commit | 801201aa25646291aa87ba97250f6614639eb2ea (patch) | |
| tree | 7088c2a5923546d325d42bbe024e693cdb3b76d8 /arch/x86/crypto/cast6_avx_glue.c | |
| parent | a62b01cd6cc1feb5e80d64d6937c291473ed82cb (diff) | |
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/cast6_avx_glue.c')
| -rw-r--r-- | arch/x86/crypto/cast6_avx_glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/cast6_avx_glue.c b/arch/x86/crypto/cast6_avx_glue.c index 8d0dfb86a559..09f3677393e4 100644 --- a/arch/x86/crypto/cast6_avx_glue.c +++ b/arch/x86/crypto/cast6_avx_glue.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 29 | #include <linux/crypto.h> | 29 | #include <linux/crypto.h> |
| 30 | #include <linux/err.h> | 30 | #include <linux/err.h> |
| 31 | #include <crypto/ablk_helper.h> | ||
| 31 | #include <crypto/algapi.h> | 32 | #include <crypto/algapi.h> |
| 32 | #include <crypto/cast6.h> | 33 | #include <crypto/cast6.h> |
| 33 | #include <crypto/cryptd.h> | 34 | #include <crypto/cryptd.h> |
| @@ -37,7 +38,6 @@ | |||
| 37 | #include <crypto/xts.h> | 38 | #include <crypto/xts.h> |
| 38 | #include <asm/xcr.h> | 39 | #include <asm/xcr.h> |
| 39 | #include <asm/xsave.h> | 40 | #include <asm/xsave.h> |
| 40 | #include <asm/crypto/ablk_helper.h> | ||
| 41 | #include <asm/crypto/glue_helper.h> | 41 | #include <asm/crypto/glue_helper.h> |
| 42 | 42 | ||
| 43 | #define CAST6_PARALLEL_BLOCKS 8 | 43 | #define CAST6_PARALLEL_BLOCKS 8 |