diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-06-14 16:12:40 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2017-06-14 16:12:40 +0200 |
| commit | b1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4 (patch) | |
| tree | 6b984a37fa4e4acdb9512719c7de1e84610a6242 /crypto/lzo.c | |
| parent | 4c6427919ee920d5963cf826de76292286342aa0 (diff) | |
| parent | 0930c08c6bc50a3a62ee3c90fad305840affbaf2 (diff) | |
| download | linux-crypto-b1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4.tar.gz linux-crypto-b1d622fc5293ae805065a0fe3bf74cc2cc1bc5f4.zip | |
Merge tag 'v4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 4.12-rc5
Diffstat (limited to 'crypto/lzo.c')
| -rw-r--r-- | crypto/lzo.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/lzo.c b/crypto/lzo.c index 168df784..218567d7 100644 --- 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); |