diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2016-12-28 12:39:26 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-12-28 12:39:26 +0300 |
| commit | 5386e5d1f8b7305e447b781f7ac02649f7a4d055 (patch) | |
| tree | 549a6b9cd304869c77a9007f86bae984298f2017 /arch/arm/crypto/Makefile | |
| parent | fb91a661d99f460f2ea4c7f23ed47f56863ca1d1 (diff) | |
| download | linux-5386e5d1f8b7305e447b781f7ac02649f7a4d055.tar.xz | |
Revert "crypto: arm64/ARM: NEON accelerated ChaCha20"
This patch reverts the following commits:
8621caa0d45e731f2e9f5889ff5bb384fcd6e059
8096667273477e735b0072b11a6d617ccee45e5f
I should not have applied them because they had already been
obsoleted by a subsequent patch series. They also cause a build
failure because of the subsequent commit 9ae433bc79f9.
Fixes: 9ae433bc79f ("crypto: chacha20 - convert generic and...")
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/arm/crypto/Makefile')
| -rw-r--r-- | arch/arm/crypto/Makefile | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/crypto/Makefile b/arch/arm/crypto/Makefile index 8d74e55eacd4..b578a1820ab1 100644 --- a/arch/arm/crypto/Makefile +++ b/arch/arm/crypto/Makefile @@ -8,7 +8,6 @@ obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o -obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha20-neon.o ce-obj-$(CONFIG_CRYPTO_AES_ARM_CE) += aes-arm-ce.o ce-obj-$(CONFIG_CRYPTO_SHA1_ARM_CE) += sha1-arm-ce.o @@ -41,7 +40,6 @@ aes-arm-ce-y := aes-ce-core.o aes-ce-glue.o ghash-arm-ce-y := ghash-ce-core.o ghash-ce-glue.o crct10dif-arm-ce-y := crct10dif-ce-core.o crct10dif-ce-glue.o crc32-arm-ce-y:= crc32-ce-core.o crc32-ce-glue.o -chacha20-neon-y := chacha20-neon-core.o chacha20-neon-glue.o quiet_cmd_perl = PERL $@ cmd_perl = $(PERL) $(<) > $(@) |