diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-28 09:05:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-28 09:05:18 -0800 |
| commit | 3f25a5990d9d32e8f77ce830b9ea6c0e4f4bea4b (patch) | |
| tree | cd00b65c392211d908de709e30e9119218ca7e12 /drivers/crypto | |
| parent | 8ed0579c12b2fe56a1fac2f712f58fc26c1dc49b (diff) | |
| parent | c64316502008064c158fa40cc250665e461b0f2a (diff) | |
| download | linux-3f25a5990d9d32e8f77ce830b9ea6c0e4f4bea4b.tar.bz2 | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a compiler warning introduced by a previous fix, as well as
two crash bugs on ARM"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: sha512/arm - fix crash bug in Thumb2 build
crypto: sha256/arm - fix crash bug in Thumb2 build
crypto: ccree - add missing inline qualifier
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/ccree/cc_pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/crypto/ccree/cc_pm.h b/drivers/crypto/ccree/cc_pm.h index f62624357020..907a6db4d6c0 100644 --- a/drivers/crypto/ccree/cc_pm.h +++ b/drivers/crypto/ccree/cc_pm.h @@ -30,7 +30,7 @@ static inline int cc_pm_init(struct cc_drvdata *drvdata) return 0; } -static void cc_pm_go(struct cc_drvdata *drvdata) {} +static inline void cc_pm_go(struct cc_drvdata *drvdata) {} static inline void cc_pm_fini(struct cc_drvdata *drvdata) {} |