From: Eric Biggers Date: Thu, 24 Apr 2025 00:20:38 +0000 (-0700) Subject: x86/crc: drop "glue" from filenames X-Git-Tag: v6.16-rc1~207^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=35984c730dea1a9fdd5d931f298849605850856a;p=thirdparty%2Fkernel%2Flinux.git x86/crc: drop "glue" from filenames The use of the term "glue" in filenames is a Crypto API-ism that rarely shows up elsewhere in lib/ or arch/*/lib/. I think adopting it there was a mistake. The library just uses standard functions, so the amount of code that could be considered "glue" is quite small. And while often the C functions just wrap the assembly functions, there are also cases like crc32c_arch() in arch/x86/lib/crc32-glue.c that blur the line by in-lining the actual implementation into the C function. That's not "glue code", but rather the actual code. Therefore, let's drop "glue" from the filenames and instead use e.g. crc32.c instead of crc32-glue.c. Reviewed-by: "Martin K. Petersen" Acked-by: Ard Biesheuvel Link: https://lore.kernel.org/r/20250424002038.179114-8-ebiggers@kernel.org Signed-off-by: Eric Biggers --- diff --git a/arch/x86/lib/Makefile b/arch/x86/lib/Makefile index 1c50352eb49f9..7cf8681cba0f2 100644 --- a/arch/x86/lib/Makefile +++ b/arch/x86/lib/Makefile @@ -39,14 +39,14 @@ lib-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o lib-$(CONFIG_MITIGATION_RETPOLINE) += retpoline.o obj-$(CONFIG_CRC32_ARCH) += crc32-x86.o -crc32-x86-y := crc32-glue.o crc32-pclmul.o +crc32-x86-y := crc32.o crc32-pclmul.o crc32-x86-$(CONFIG_64BIT) += crc32c-3way.o obj-$(CONFIG_CRC64_ARCH) += crc64-x86.o -crc64-x86-y := crc64-glue.o crc64-pclmul.o +crc64-x86-y := crc64.o crc64-pclmul.o obj-$(CONFIG_CRC_T10DIF_ARCH) += crc-t10dif-x86.o -crc-t10dif-x86-y := crc-t10dif-glue.o crc16-msb-pclmul.o +crc-t10dif-x86-y := crc-t10dif.o crc16-msb-pclmul.o obj-y += msr.o msr-reg.o msr-reg-export.o hweight.o obj-y += iomem.o diff --git a/arch/x86/lib/crc-t10dif-glue.c b/arch/x86/lib/crc-t10dif.c similarity index 100% rename from arch/x86/lib/crc-t10dif-glue.c rename to arch/x86/lib/crc-t10dif.c diff --git a/arch/x86/lib/crc32-glue.c b/arch/x86/lib/crc32.c similarity index 100% rename from arch/x86/lib/crc32-glue.c rename to arch/x86/lib/crc32.c diff --git a/arch/x86/lib/crc64-glue.c b/arch/x86/lib/crc64.c similarity index 100% rename from arch/x86/lib/crc64-glue.c rename to arch/x86/lib/crc64.c