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