diff options
-rw-r--r-- | arch/s390/lib/Makefile | 1 | ||||
-rw-r--r-- | lib/crypto/Kconfig | 2 | ||||
-rw-r--r-- | lib/crypto/Makefile | 1 | ||||
-rw-r--r-- | lib/crypto/s390/Kconfig (renamed from arch/s390/lib/crypto/Kconfig) | 0 | ||||
-rw-r--r-- | lib/crypto/s390/Makefile (renamed from arch/s390/lib/crypto/Makefile) | 0 | ||||
-rw-r--r-- | lib/crypto/s390/chacha-glue.c (renamed from arch/s390/lib/crypto/chacha-glue.c) | 0 | ||||
-rw-r--r-- | lib/crypto/s390/chacha-s390.S (renamed from arch/s390/lib/crypto/chacha-s390.S) | 0 | ||||
-rw-r--r-- | lib/crypto/s390/chacha-s390.h (renamed from arch/s390/lib/crypto/chacha-s390.h) | 0 | ||||
-rw-r--r-- | lib/crypto/s390/sha256.c (renamed from arch/s390/lib/crypto/sha256.c) | 0 |
9 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/lib/Makefile b/arch/s390/lib/Makefile index cd35cdbfa871..271a1c407121 100644 --- a/arch/s390/lib/Makefile +++ b/arch/s390/lib/Makefile @@ -3,7 +3,6 @@ # 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 diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig index a2b58ca2df0c..278b7ef5ec4f 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -205,7 +205,7 @@ 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" diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index 05b7e29ea0e8..26f65bb4c8d8 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -112,3 +112,4 @@ 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 index e3f855ef4393..e3f855ef4393 100644 --- a/arch/s390/lib/crypto/Kconfig +++ b/lib/crypto/s390/Kconfig diff --git a/arch/s390/lib/crypto/Makefile b/lib/crypto/s390/Makefile index 5df30f1e7930..5df30f1e7930 100644 --- a/arch/s390/lib/crypto/Makefile +++ b/lib/crypto/s390/Makefile diff --git a/arch/s390/lib/crypto/chacha-glue.c b/lib/crypto/s390/chacha-glue.c index f95ba3483bbc..f95ba3483bbc 100644 --- a/arch/s390/lib/crypto/chacha-glue.c +++ b/lib/crypto/s390/chacha-glue.c diff --git a/arch/s390/lib/crypto/chacha-s390.S b/lib/crypto/s390/chacha-s390.S index 63f3102678c0..63f3102678c0 100644 --- a/arch/s390/lib/crypto/chacha-s390.S +++ b/lib/crypto/s390/chacha-s390.S diff --git a/arch/s390/lib/crypto/chacha-s390.h b/lib/crypto/s390/chacha-s390.h index 733744ce30f5..733744ce30f5 100644 --- a/arch/s390/lib/crypto/chacha-s390.h +++ b/lib/crypto/s390/chacha-s390.h diff --git a/arch/s390/lib/crypto/sha256.c b/lib/crypto/s390/sha256.c index 7dfe120fafab..7dfe120fafab 100644 --- a/arch/s390/lib/crypto/sha256.c +++ b/lib/crypto/s390/sha256.c |