Merge tag 'iommu-updates-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-artful-kernel.git] / crypto / lzo.c

diff --git a/crypto/lzo.c b/crypto/lzo.c
index 168df784da8491e2daccf5b79316fb2191b46e6d..218567d717d6831bff36743e5977ee73236cf0ce 100644 (file)
--- a/crypto/lzo.c
+++ b/crypto/lzo.c
@@ -32,9 +32,7 @@ static void *lzo_alloc_ctx(struct crypto_scomp *tfm)
 {
        void *ctx;
 
-       ctx = kmalloc(LZO1X_MEM_COMPRESS, GFP_KERNEL | __GFP_NOWARN);
-       if (!ctx)
-               ctx = vmalloc(LZO1X_MEM_COMPRESS);
+       ctx = kvmalloc(LZO1X_MEM_COMPRESS, GFP_KERNEL);
        if (!ctx)
                return ERR_PTR(-ENOMEM);