From: Eric Biggers <ebigg...@google.com> Move the contents of arch/s390/lib/crypto/ into lib/crypto/s390/.
The new code organization makes a lot more sense for how this code actually works and is developed. In particular, it makes it possible to build each algorithm as a single module, with better inlining and dead code elimination. For a more detailed explanation, see the patchset which did this for the CRC library code: https://lore.kernel.org/r/20250607200454.73587-1-ebigg...@kernel.org/. Also see the patchset which did this for SHA-512: https://lore.kernel.org/linux-crypto/20250616014019.415791-1-ebigg...@kernel.org/ This is just a preparatory commit, which does the move to get the files into their new location but keeps them building the same way as before. Later commits will make the actual improvements to the way the arch-optimized code is integrated for each algorithm. Signed-off-by: Eric Biggers <ebigg...@google.com> --- arch/s390/lib/Makefile | 1 - lib/crypto/Kconfig | 2 +- lib/crypto/Makefile | 1 + {arch/s390/lib/crypto => lib/crypto/s390}/Kconfig | 0 {arch/s390/lib/crypto => lib/crypto/s390}/Makefile | 0 {arch/s390/lib/crypto => lib/crypto/s390}/chacha-glue.c | 0 {arch/s390/lib/crypto => lib/crypto/s390}/chacha-s390.S | 0 {arch/s390/lib/crypto => lib/crypto/s390}/chacha-s390.h | 0 {arch/s390/lib/crypto => lib/crypto/s390}/sha256.c | 0 9 files changed, 2 insertions(+), 2 deletions(-) rename {arch/s390/lib/crypto => lib/crypto/s390}/Kconfig (100%) rename {arch/s390/lib/crypto => lib/crypto/s390}/Makefile (100%) rename {arch/s390/lib/crypto => lib/crypto/s390}/chacha-glue.c (100%) rename {arch/s390/lib/crypto => lib/crypto/s390}/chacha-s390.S (100%) rename {arch/s390/lib/crypto => lib/crypto/s390}/chacha-s390.h (100%) rename {arch/s390/lib/crypto => lib/crypto/s390}/sha256.c (100%) diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile index cd35cdbfa8713..271a1c407121c 100644 --- a/arch/s390/lib/Makefile +++ b/arch/s390/lib/Makefile @@ -1,11 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 # # Makefile for s390-specific library files.. # -obj-y += crypto/ lib-y += delay.o string.o uaccess.o find.o spinlock.o tishift.o lib-y += csum-partial.o obj-y += mem.o xor.o lib-$(CONFIG_KPROBES) += probes.o lib-$(CONFIG_UPROBES) += probes.o diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig index a2b58ca2df0cc..278b7ef5ec4f9 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -203,11 +203,11 @@ source "lib/crypto/powerpc/Kconfig" endif if RISCV source "lib/crypto/riscv/Kconfig" endif if S390 -source "arch/s390/lib/crypto/Kconfig" +source "lib/crypto/s390/Kconfig" endif if SPARC source "arch/sparc/lib/crypto/Kconfig" endif if X86 diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index 0fe9200a031d6..4cda1f5cd21d4 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -106,5 +106,6 @@ libsm3-y := sm3.o obj-$(CONFIG_ARM) += arm/ obj-$(CONFIG_ARM64) += arm64/ obj-$(CONFIG_MIPS) += mips/ obj-$(CONFIG_PPC) += powerpc/ obj-$(CONFIG_RISCV) += riscv/ +obj-$(CONFIG_S390) += s390/ diff --git a/arch/s390/lib/crypto/Kconfig b/lib/crypto/s390/Kconfig similarity index 100% rename from arch/s390/lib/crypto/Kconfig rename to lib/crypto/s390/Kconfig diff --git a/arch/s390/lib/crypto/Makefile b/lib/crypto/s390/Makefile similarity index 100% rename from arch/s390/lib/crypto/Makefile rename to lib/crypto/s390/Makefile diff --git a/arch/s390/lib/crypto/chacha-glue.c b/lib/crypto/s390/chacha-glue.c similarity index 100% rename from arch/s390/lib/crypto/chacha-glue.c rename to lib/crypto/s390/chacha-glue.c diff --git a/arch/s390/lib/crypto/chacha-s390.S b/lib/crypto/s390/chacha-s390.S similarity index 100% rename from arch/s390/lib/crypto/chacha-s390.S rename to lib/crypto/s390/chacha-s390.S diff --git a/arch/s390/lib/crypto/chacha-s390.h b/lib/crypto/s390/chacha-s390.h similarity index 100% rename from arch/s390/lib/crypto/chacha-s390.h rename to lib/crypto/s390/chacha-s390.h diff --git a/arch/s390/lib/crypto/sha256.c b/lib/crypto/s390/sha256.c similarity index 100% rename from arch/s390/lib/crypto/sha256.c rename to lib/crypto/s390/sha256.c -- 2.49.0
