Automatic merge of /spare/repo/netdev-2.6 branch master

1 files changed, 1 insertions, 1 deletions

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();
 }