Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

[linux.git] / drivers / crypto / virtio / virtio_crypto_algs.c

diff --git a/drivers/crypto/virtio/virtio_crypto_algs.c b/drivers/crypto/virtio/virtio_crypto_algs.c
index 7a104f636f1120f658e4ae126b94de1bd8789075..2c573d1aaa64f2bd2f7c70088c6ddec7ad81f35b 100644 (file)
--- a/drivers/crypto/virtio/virtio_crypto_algs.c
+++ b/drivers/crypto/virtio/virtio_crypto_algs.c
@@ -383,12 +383,12 @@ __virtio_crypto_ablkcipher_do_req(struct virtio_crypto_sym_request *vc_sym_req,
 
        /* Why 3?  outhdr + iv + inhdr */
        sg_total = src_nents + dst_nents + 3;
-       sgs = kcalloc_node(sg_total, sizeof(*sgs), GFP_ATOMIC,
+       sgs = kcalloc_node(sg_total, sizeof(*sgs), GFP_KERNEL,
                                dev_to_node(&vcrypto->vdev->dev));
        if (!sgs)
                return -ENOMEM;
 
-       req_data = kzalloc_node(sizeof(*req_data), GFP_ATOMIC,
+       req_data = kzalloc_node(sizeof(*req_data), GFP_KERNEL,
                                dev_to_node(&vcrypto->vdev->dev));
        if (!req_data) {
                kfree(sgs);