---

yaml --- r: 34230 b: refs/heads/master c: 8f21cf0 h: refs/heads/master v: v3
git-mirror · Sep 21, 2006 · 67986a6 · 67986a6
1 parent 3478b3f
commit 67986a6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d7d684d635ac5a345f075015f2c84169c111c6a
+refs/heads/master: 8f21cf0d2bae04ece761595036c9da8328b279aa
diff --git a/trunk/crypto/cipher.c b/trunk/crypto/cipher.c
@@ -145,7 +145,7 @@ static int crypt(const struct cipher_desc *desc,
 		if (!nbytes)
 			break;
 
-		crypto_yield(tfm);
+		crypto_yield(tfm->crt_flags);
 	}
 
 	if (buffer)

diff --git a/trunk/crypto/digest.c b/trunk/crypto/digest.c
@@ -55,7 +55,7 @@ static void update(struct crypto_tfm *tfm,
 			tfm->__crt_alg->cra_digest.dia_update(tfm, p,
 							      bytes_from_page);
 			crypto_kunmap(src, 0);
-			crypto_yield(tfm);
+			crypto_yield(tfm->crt_flags);
 			offset = 0;
 			pg++;
 			l -= bytes_from_page;

diff --git a/trunk/crypto/internal.h b/trunk/crypto/internal.h
@@ -67,9 +67,9 @@ static inline void crypto_kunmap(void *vaddr, int out)
 	kunmap_atomic(vaddr, crypto_kmap_type(out));
 }
 
-static inline void crypto_yield(struct crypto_tfm *tfm)
+static inline void crypto_yield(u32 flags)
 {
-	if (tfm->crt_flags & CRYPTO_TFM_REQ_MAY_SLEEP)
+	if (flags & CRYPTO_TFM_REQ_MAY_SLEEP)
 		cond_resched();
 }