4 files changed, 6 insertions, 6 deletions

diff --git a/crypto/ablkcipher.c b/crypto/ablkcipher.c
index b788f169cc98..b4ffc5be1a93 100644
--- a/crypto/ablkcipher.c
+++ b/crypto/ablkcipher.c
@@ -706,7 +706,7 @@ struct crypto_ablkcipher *crypto_alloc_ablkcipher(const char *alg_name,
 err:
                 if (err != -EAGAIN)
                         break;
-                if (signal_pending(current)) {
+                if (fatal_signal_pending(current)) {
                         err = -EINTR;
                         break;
                 }
diff --git a/crypto/algapi.c b/crypto/algapi.c
index d130b41dbaea..59bf491fe3d8 100644
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -345,7 +345,7 @@ static void crypto_wait_for_test(struct crypto_larval *larval)
                 crypto_alg_tested(larval->alg.cra_driver_name, 0);
         }
 
-        err = wait_for_completion_interruptible(&larval->completion);
+        err = wait_for_completion_killable(&larval->completion);
         WARN_ON(err);
 
 out:
diff --git a/crypto/api.c b/crypto/api.c
index afe4610afc4b..bbc147cb5dec 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -172,7 +172,7 @@ static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg)
         struct crypto_larval *larval = (void *)alg;
         long timeout;
 
-        timeout = wait_for_completion_interruptible_timeout(
+        timeout = wait_for_completion_killable_timeout(
                 &larval->completion, 60 * HZ);
 
         alg = larval->adult;
@@ -445,7 +445,7 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask)
 err:
                 if (err != -EAGAIN)
                         break;
-                if (signal_pending(current)) {
+                if (fatal_signal_pending(current)) {
                         err = -EINTR;
                         break;
                 }
@@ -562,7 +562,7 @@ void *crypto_alloc_tfm(const char *alg_name,
 err:
                 if (err != -EAGAIN)
                         break;
-                if (signal_pending(current)) {
+                if (fatal_signal_pending(current)) {
                         err = -EINTR;
                         break;
                 }
diff --git a/crypto/crypto_user.c b/crypto/crypto_user.c
index d94d99ffe8b9..237f3795cfaa 100644
--- a/crypto/crypto_user.c
+++ b/crypto/crypto_user.c
@@ -375,7 +375,7 @@ static struct crypto_alg *crypto_user_skcipher_alg(const char *name, u32 type,
                 err = PTR_ERR(alg);
                 if (err != -EAGAIN)
                         break;
-                if (signal_pending(current)) {
+                if (fatal_signal_pending(current)) {
                         err = -EINTR;
                         break;
                 }