From 15333038d577b0c0255c0f14a38d9e6895937453 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Mon, 23 May 2005 12:36:25 -0700 Subject: [CRYPTO]: Only reschedule if !in_atomic() The netlink gfp_any() problem made me double-check the uses of in_softirq() in crypto/*. It seems to me that we should be checking in_atomic() instead of in_softirq() in crypto_yield. Otherwise people calling the crypto ops with spin locks held or preemption disabled will get burnt, right? Signed-off-by: David S. Miller --- crypto/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'crypto/internal.h') diff --git a/crypto/internal.h b/crypto/internal.h index e68e43886d3c..964b9a60ca24 100644 --- a/crypto/internal.h +++ b/crypto/internal.h @@ -38,7 +38,7 @@ static inline void crypto_kunmap(void *vaddr, int out) static inline void crypto_yield(struct crypto_tfm *tfm) { - if (!in_softirq()) + if (!in_atomic()) cond_resched(); } -- cgit v1.2.3-59-g8ed1b