X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=blobdiff_plain;f=crypto%2Fapi.c;h=a5547fbbdc4e3502ddc4a1e8c228992da4c556a5;hp=ac80794906c6f4fcc064afbac3565f2dca3c5ade;hb=3ba1945b048afd9cd8dba6b341160fffc4e431a0;hpb=9ffea4cb2306945b5df5f28bb8686333fe666bf1 diff --git a/crypto/api.c b/crypto/api.c index ac80794906c6..a5547fbbdc4e 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -178,7 +178,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; @@ -441,7 +441,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; } @@ -558,7 +558,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; }