summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-06-28 03:32:30 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2025-06-28 03:32:30 +0300
commit5683cd63a33a5f0bf629a77f704ddd45cdb36cba (patch)
tree9fb5d29b107a20ca48668e77715744405a4cb994
parent35e261cd95ddc741d8664f5ac897bbd0d384bbd0 (diff)
parent64f7548aad63d2fbca2eeb6eb33361c218ebd5a5 (diff)
downloadlinux-5683cd63a33a5f0bf629a77f704ddd45cdb36cba.tar.xz
Merge tag 'libcrypto-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux
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
-rw-r--r--include/crypto/internal/sha2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/crypto/internal/sha2.h b/include/crypto/internal/sha2.h
index b9bccd3ff57f..21a27fd5e198 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)
{