summaryrefslogtreecommitdiffstats
path: root/include/crypto
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2019-07-26 22:19:07 +0200
committerHerbert Xu <herbert@gondor.apana.org.au>2019-08-02 14:45:13 +1000
commitf9981bc53825de2c001659d35c870786771f1e90 (patch)
tree1466c732fc5dcb3fc64c73f1ee9216a9c38b2ece /include/crypto
parent3e75241be8081f22f7382f4041496b10a4d9aed0 (diff)
downloadlinux-stable-f9981bc53825de2c001659d35c870786771f1e90.tar.gz
linux-stable-f9981bc53825de2c001659d35c870786771f1e90.tar.bz2
linux-stable-f9981bc53825de2c001659d35c870786771f1e90.zip
crypto: api - Remove redundant #ifdef in crypto_yield()
While looking at CONFIG_PREEMPT dependencies treewide the #ifdef in crypto_yield() matched. CONFIG_PREEMPT and CONFIG_PREEMPT_VOLUNTARY are mutually exclusive so the extra !CONFIG_PREEMPT conditional is redundant. cond_resched() has only an effect when CONFIG_PREEMPT_VOLUNTARY is set, otherwise it's a stub which the compiler optimizes out. Remove the whole conditional. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: linux-crypto@vger.kernel.org Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: "David S. Miller" <davem@davemloft.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'include/crypto')
-rw-r--r--include/crypto/algapi.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index dc1106af95c3..e5bd302f2c49 100644
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.h
@@ -409,10 +409,8 @@ static inline int crypto_memneq(const void *a, const void *b, size_t size)
static inline void crypto_yield(u32 flags)
{
-#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PREEMPT_VOLUNTARY)
if (flags & CRYPTO_TFM_REQ_MAY_SLEEP)
cond_resched();
-#endif
}
int crypto_register_notifier(struct notifier_block *nb);