diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:25:14 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:25:14 +0800 |
commit | f90ae1b62bedd8b57966a7be68855f2d43170db6 (patch) | |
tree | dc332d18219749a17b163d740b8713be5e8d940b /crypto/api.c | |
parent | 346a8beb760237fb0fed811045ec92c799f48d54 (diff) | |
parent | 60917545df1ffc7f918550512dc4a14758f74784 (diff) |
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18lsk-v3.18-16.01
Diffstat (limited to 'crypto/api.c')
-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 2a81e98a0021..7db2e89a3114 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; @@ -435,7 +435,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; } @@ -552,7 +552,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; } |