From 0e385687cb006f1a60525cbf56fd6a7c95b6506a Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 23 May 2005 12:36:25 -0700
Subject: [PATCH] --- yaml --- r: 1327 b: refs/heads/master c:
 15333038d577b0c0255c0f14a38d9e6895937453 h: refs/heads/master i:   1325:
 a6fd757c667175daf6e8c553bf5cbe8ff8847c98   1323:
 9b61543e0a8082b3155f3a204eb5a67945fdb483   1319:
 4a4262947c7f5a0182d3ecc0ac382b64f745bc4d   1311:
 d22642a0b92f07510b27a85f9fbaafb4cc65955c v: v3

---
 [refs]                  | 2 +-
 trunk/crypto/internal.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index af8fd47ff5dd..a3be568e60de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 314324121f9b94b2ca657a494cf2b9cb0e4a28cc
+refs/heads/master: 15333038d577b0c0255c0f14a38d9e6895937453
diff --git a/trunk/crypto/internal.h b/trunk/crypto/internal.h
index e68e43886d3c..964b9a60ca24 100644
--- a/trunk/crypto/internal.h
+++ b/trunk/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();
 }