diff options
| author | Linus Torvalds | 2016-05-17 01:40:14 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2016-05-17 01:40:14 +0200 |
| commit | bcea36df7ae4b0db0b6e5e6dd3e5efe03410f5da (patch) | |
| tree | c46a85a221a56279ef34aab003743aed1e11624b /arch/x86/crypto | |
| parent | Merge branch 'x86-build-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | x86: Fix non-static inlines (diff) | |
| download | kernel-qcow2-linux-bcea36df7ae4b0db0b6e5e6dd3e5efe03410f5da.tar.gz kernel-qcow2-linux-bcea36df7ae4b0db0b6e5e6dd3e5efe03410f5da.tar.xz kernel-qcow2-linux-bcea36df7ae4b0db0b6e5e6dd3e5efe03410f5da.zip | |
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanup from Ingo Molnar:
"Inline optimizations"
* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Fix non-static inlines
Diffstat (limited to 'arch/x86/crypto')
| -rw-r--r-- | arch/x86/crypto/sha-mb/sha1_mb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/sha-mb/sha1_mb.c b/arch/x86/crypto/sha-mb/sha1_mb.c index 081255cea1ee..9c5af331a956 100644 --- a/arch/x86/crypto/sha-mb/sha1_mb.c +++ b/arch/x86/crypto/sha-mb/sha1_mb.c @@ -102,14 +102,14 @@ static asmlinkage struct job_sha1* (*sha1_job_mgr_submit)(struct sha1_mb_mgr *st static asmlinkage struct job_sha1* (*sha1_job_mgr_flush)(struct sha1_mb_mgr *state); static asmlinkage struct job_sha1* (*sha1_job_mgr_get_comp_job)(struct sha1_mb_mgr *state); -inline void sha1_init_digest(uint32_t *digest) +static inline void sha1_init_digest(uint32_t *digest) { static const uint32_t initial_digest[SHA1_DIGEST_LENGTH] = {SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 }; memcpy(digest, initial_digest, sizeof(initial_digest)); } -inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2], +static inline uint32_t sha1_pad(uint8_t padblock[SHA1_BLOCK_SIZE * 2], uint32_t total_len) { uint32_t i = total_len & (SHA1_BLOCK_SIZE - 1); |