diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-03 08:03:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-03 08:03:45 -0700 |
| commit | 04446eee58fcb2a6c9db5abff7f07cc2f38da9d0 (patch) | |
| tree | f974d6e0a7e8ecfa51ad3481c66152c1869817af | |
| parent | 8b2198f03776c5c25f0cafe0ba5c0c60807b554b (diff) | |
| parent | b9802b54d41bbe98f673e08bc148b0c563fdc02e (diff) | |
Merge tag 'v6.16-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"Fix a loongarch header regression and a module name collision on s390"
* tag 'v6.16-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
asm-generic: Add sched.h inclusion in simd.h
crypto: s390/sha256 - rename module to sha256-s390
| -rw-r--r-- | arch/s390/lib/crypto/Makefile | 3 | ||||
| -rw-r--r-- | include/asm-generic/simd.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/lib/crypto/Makefile b/arch/s390/lib/crypto/Makefile index 920197967f46..5df30f1e7930 100644 --- a/arch/s390/lib/crypto/Makefile +++ b/arch/s390/lib/crypto/Makefile @@ -3,4 +3,5 @@ obj-$(CONFIG_CRYPTO_CHACHA_S390) += chacha_s390.o chacha_s390-y := chacha-glue.o chacha-s390.o -obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256.o +obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256-s390.o +sha256-s390-y := sha256.o diff --git a/include/asm-generic/simd.h b/include/asm-generic/simd.h index ac29a22eb7cf..70c8716ad32a 100644 --- a/include/asm-generic/simd.h +++ b/include/asm-generic/simd.h @@ -4,6 +4,7 @@ #include <linux/compiler_attributes.h> #include <linux/preempt.h> +#include <linux/sched.h> #include <linux/types.h> /* |