diff options
| author | Marek Vasut <marex@denx.de> | 2014-05-26 09:32:05 -0400 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-06-20 09:26:04 -0400 |
| commit | bb55a4c100abbb8d2a41e732f6362c575a7094e6 (patch) | |
| tree | 9218210796fbefc1b52831a53cc4da7f1c898b54 /include/crypto | |
| parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) | |
crypto: api - Move crypto_yield() to algapi.h
It makes no sense for crypto_yield() to be defined in scatterwalk.h ,
move it into algapi.h as it's an internal function to crypto API.
Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/crypto')
| -rw-r--r-- | include/crypto/algapi.h | 6 | ||||
| -rw-r--r-- | include/crypto/scatterwalk.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h index 016c2f110f63..623a59c1ff5a 100644 --- a/include/crypto/algapi.h +++ b/include/crypto/algapi.h | |||
| @@ -410,4 +410,10 @@ static inline int crypto_memneq(const void *a, const void *b, size_t size) | |||
| 410 | return __crypto_memneq(a, b, size) != 0UL ? 1 : 0; | 410 | return __crypto_memneq(a, b, size) != 0UL ? 1 : 0; |
| 411 | } | 411 | } |
| 412 | 412 | ||
| 413 | static inline void crypto_yield(u32 flags) | ||
| 414 | { | ||
| 415 | if (flags & CRYPTO_TFM_REQ_MAY_SLEEP) | ||
| 416 | cond_resched(); | ||
| 417 | } | ||
| 418 | |||
| 413 | #endif /* _CRYPTO_ALGAPI_H */ | 419 | #endif /* _CRYPTO_ALGAPI_H */ |
diff --git a/include/crypto/scatterwalk.h b/include/crypto/scatterwalk.h index 6a626a507b8c..7ef512f8631c 100644 --- a/include/crypto/scatterwalk.h +++ b/include/crypto/scatterwalk.h | |||
| @@ -25,12 +25,6 @@ | |||
| 25 | #include <linux/scatterlist.h> | 25 | #include <linux/scatterlist.h> |
| 26 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 27 | 27 | ||
| 28 | static inline void crypto_yield(u32 flags) | ||
| 29 | { | ||
| 30 | if (flags & CRYPTO_TFM_REQ_MAY_SLEEP) | ||
| 31 | cond_resched(); | ||
| 32 | } | ||
| 33 | |||
| 34 | static inline void scatterwalk_sg_chain(struct scatterlist *sg1, int num, | 28 | static inline void scatterwalk_sg_chain(struct scatterlist *sg1, int num, |
| 35 | struct scatterlist *sg2) | 29 | struct scatterlist *sg2) |
| 36 | { | 30 | { |
