Skip to content

Commit 46e3311

Browse files
committed
crypto: crc32 - remove "generic" from file and module names
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. Acked-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Eric Biggers <[email protected]>
1 parent 35984c7 commit 46e3311

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

crypto/Makefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,12 @@ obj-$(CONFIG_CRYPTO_CHACHA20) += chacha_generic.o
152152
obj-$(CONFIG_CRYPTO_POLY1305) += poly1305_generic.o
153153
obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o
154154
obj-$(CONFIG_CRYPTO_MICHAEL_MIC) += michael_mic.o
155-
obj-$(CONFIG_CRYPTO_CRC32C) += crc32c_generic.o
156-
obj-$(CONFIG_CRYPTO_CRC32) += crc32_generic.o
157-
CFLAGS_crc32c_generic.o += -DARCH=$(ARCH)
158-
CFLAGS_crc32_generic.o += -DARCH=$(ARCH)
155+
obj-$(CONFIG_CRYPTO_CRC32C) += crc32c-cryptoapi.o
156+
crc32c-cryptoapi-y := crc32c.o
157+
CFLAGS_crc32c.o += -DARCH=$(ARCH)
158+
obj-$(CONFIG_CRYPTO_CRC32) += crc32-cryptoapi.o
159+
crc32-cryptoapi-y := crc32.o
160+
CFLAGS_crc32.o += -DARCH=$(ARCH)
159161
obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o
160162
obj-$(CONFIG_CRYPTO_KRB5ENC) += krb5enc.o
161163
obj-$(CONFIG_CRYPTO_LZO) += lzo.o lzo-rle.o
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)