diff options
author | David S. Miller <davem@davemloft.net> | 2015-11-01 00:15:30 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-11-01 00:15:30 -0400 |
commit | f6bf086cf8a67c9f14de5b71cf7d9c03f042f057 (patch) | |
tree | 766d1422054a6dc11ed1f04619bd0936991dfd68 /crypto/api.c | |
parent | 7dadc1e2446dcf75527b5b8a9b8dc9f434a78785 (diff) | |
parent | fbac254eaaaf03131033caa87420f9af2e273907 (diff) | |
download | linux-crypto-f6bf086cf8a67c9f14de5b71cf7d9c03f042f057.tar.gz linux-crypto-f6bf086cf8a67c9f14de5b71cf7d9c03f042f057.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to '')
-rw-r--r-- | crypto/api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/api.c b/crypto/api.c index afe4610a..bbc147cb 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; } |