Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux

5683cd63 · Linus Torvalds <[email protected]> · 2025-06-27 17:32:30 -07:00

Pull crypto library fix from Eric Biggers:
 "Fix a regression where the purgatory code sometimes fails to build"

* tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux:
  lib/crypto: sha256: Mark sha256_choose_blocks as __always_inline

Commit: 5683cd63a33a5f0bf629a77f704ddd45cdb36cba
Parents: 35e261cd · 64f7548a

Merge commit. Changes below are compared with the first parent: 35e261cd.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
include/crypto/internal/sha2.h	modified	+1	−1	View file

include/crypto/internal/sha2.h

View file

diff --git a/include/crypto/internal/sha2.h b/include/crypto/internal/sha2.h
index b9bccd3..21a27fd 100644
--- a/include/crypto/internal/sha2.h
+++ b/include/crypto/internal/sha2.h
@@ -25,7 +25,7 @@ void sha256_blocks_arch(u32 state[SHA256_STATE_WORDS],
 void sha256_blocks_simd(u32 state[SHA256_STATE_WORDS],
 			const u8 *data, size_t nblocks);
 
-static inline void sha256_choose_blocks(
+static __always_inline void sha256_choose_blocks(
 	u32 state[SHA256_STATE_WORDS], const u8 *data, size_t nblocks,
 	bool force_generic, bool force_simd)
 {