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

torvalds · torvalds · commit 5683cd63a33a · 2025-06-27T17:32:30.000-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
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ void sha256_blocks_arch(u32 state[SHA256_STATE_WORDS],`
`25`	`25`	`void sha256_blocks_simd(u32 state[SHA256_STATE_WORDS],`
`26`	`26`	`const u8 *data, size_t nblocks);`
`27`	`27`
`28`		`-static inline void sha256_choose_blocks(`
	`28`	`+static __always_inline void sha256_choose_blocks(`
`29`	`29`	`u32 state[SHA256_STATE_WORDS], const u8 *data, size_t nblocks,`
`30`	`30`	`bool force_generic, bool force_simd)`
`31`	`31`	`{`