Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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 <arnd@arndb.de>
Link: https://lore.kernel.org/r/20250428162458.29732-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>

+6 -4
+6 -4
crypto/Makefile
··· 152 152 obj-$(CONFIG_CRYPTO_POLY1305) += poly1305_generic.o 153 153 obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o 154 154 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) 159 161 obj-$(CONFIG_CRYPTO_AUTHENC) += authenc.o authencesn.o 160 162 obj-$(CONFIG_CRYPTO_KRB5ENC) += krb5enc.o 161 163 obj-$(CONFIG_CRYPTO_LZO) += lzo.o lzo-rle.o
crypto/crc32_generic.c crypto/crc32.c
crypto/crc32c_generic.c crypto/crc32c.c