Merge tag 's390-5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[linux.git] / include / crypto / algapi.h

diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
index dc1106af95c3b43d9e07f834c1f7b25473013f2a..e5bd302f2c49e3a9012230e668ffee42fe754cff 100644 (file)
--- 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);