Commit 5683cd63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 35e261cd 64f7548a

include/crypto/internal/sha2.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

{