Merge tag 'for-5.6/io_uring-vfs-2020-01-29' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / crypto / pcrypt.c

diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index 3e026e7..1b63213 100644 (file)
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -13,7 +13,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/notifier.h>
 #include <linux/kobject.h>
 #include <linux/cpu.h>
 #include <crypto/pcrypt.h>
@@ -71,7 +70,6 @@ static void pcrypt_aead_done(struct crypto_async_request *areq, int err)
        struct padata_priv *padata = pcrypt_request_padata(preq);
 
        padata->info = err;
-       req->base.flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
 
        padata_do_serial(padata);
 }
@@ -260,9 +258,8 @@ static int pcrypt_create_aead(struct crypto_template *tmpl, struct rtattr **tb,
        if (!ctx->psdec)
                goto out_free_psenc;
 
-       crypto_set_aead_spawn(&ctx->spawn, aead_crypto_instance(inst));
-
-       err = crypto_grab_aead(&ctx->spawn, name, 0, 0);
+       err = crypto_grab_aead(&ctx->spawn, aead_crypto_instance(inst),
+                              name, 0, 0);
        if (err)
                goto out_free_psdec;