From: Eric Biggers <ebiggers@xxxxxxxxxx>
Since crc32_generic.c and crc32c_generic.c now expose both the generic
and architecture-optimized implementations via the crypto_shash API,
rather than just the generic implementations as they originally did,
remove the "generic" part of the filenames and module names:
crypto/crc32-generic.c => crypto/crc32.c
crypto/crc32c-generic.c => crypto/crc32c.c
crc32-generic.ko => crc32-cryptoapi.ko
crc32c-generic.ko => crc32c-cryptoapi.ko
The reason for adding the -cryptoapi suffixes to the module names is to
avoid a module name collision with crc32.ko which is the library API.
We could instead rename the library module to libcrc32.ko. However,
while lib/crypto/ uses that convention, the rest of lib/ doesn't. Since
the library API is the primary API for CRC-32, I'd like to keep the
unsuffixed name for it and make the Crypto API modules use a suffix.
Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx>
---
I'm planning to take this via the crc tree.
v2: Added -cryptoapi suffix to avoid duplicate module name.
Reported by Arnd Bergmann.
crypto/Makefile | 10 ++++++----
crypto/{crc32_generic.c => crc32.c} | 0
crypto/{crc32c_generic.c => crc32c.c} | 0
3 files changed, 6 insertions(+), 4 deletions(-)
rename crypto/{crc32_generic.c => crc32.c} (100%)
rename crypto/{crc32c_generic.c => crc32c.c} (100%)
diff --git a/crypto/Makefile b/crypto/Makefile
index 0e6ab5ffd3f77..186f968baa39e 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -150,14 +150,16 @@ obj-$(CONFIG_CRYPTO_SEED) += seed.o
obj-$(CONFIG_CRYPTO_ARIA) += aria_generic.o
obj-$(CONFIG_CRYPTO_CHACHA20) += chacha_generic.o
obj-$(CONFIG_CRYPTO_POLY1305) += poly1305_generic.o
obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
-obj-$(CONFIG_CRYPTO_CRC32C) += crc32c_generic.o
-obj-$(CONFIG_CRYPTO_CRC32) += crc32_generic.o
-CFLAGS_crc32c_generic.o += -DARCH=$(ARCH)
-CFLAGS_crc32_generic.o += -DARCH=$(ARCH)
+obj-$(CONFIG_CRYPTO_CRC32C) += crc32c-cryptoapi.o
+crc32c-cryptoapi-y := crc32c.o
+CFLAGS_crc32c.o += -DARCH=$(ARCH)
+obj-$(CONFIG_CRYPTO_CRC32) += crc32-cryptoapi.o
+crc32-cryptoapi-y := crc32.o
+CFLAGS_crc32.o += -DARCH=$(ARCH)
obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
obj-$(CONFIG_CRYPTO_KRB5ENC) += krb5enc.o
obj-$(CONFIG_CRYPTO_LZO) += lzo.o lzo-rle.o
obj-$(CONFIG_CRYPTO_LZ4) += lz4.o
obj-$(CONFIG_CRYPTO_LZ4HC) += lz4hc.o
diff --git a/crypto/crc32_generic.c b/crypto/crc32.c
similarity index 100%
rename from crypto/crc32_generic.c
rename to crypto/crc32.c
diff --git a/crypto/crc32c_generic.c b/crypto/crc32c.c
similarity index 100%
rename from crypto/crc32c_generic.c
rename to crypto/crc32c.c
base-commit: 35984c730dea1a9fdd5d931f298849605850856a
--
2.49.0
