projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MALI: utgard: RK: fix compile errors under arm64
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
lzo.c
diff --git
a/crypto/lzo.c
b/crypto/lzo.c
index d1ff69404353e5c91c8af25e021f40e297527ecc..4b3e92525dac5a47f3415f46c9eb403813b44275 100644
(file)
--- a/
crypto/lzo.c
+++ b/
crypto/lzo.c
@@
-20,6
+20,7
@@
#include <linux/module.h>
#include <linux/crypto.h>
#include <linux/vmalloc.h>
#include <linux/module.h>
#include <linux/crypto.h>
#include <linux/vmalloc.h>
+#include <linux/mm.h>
#include <linux/lzo.h>
struct lzo_ctx {
#include <linux/lzo.h>
struct lzo_ctx {
@@
-30,7
+31,10
@@
static int lzo_init(struct crypto_tfm *tfm)
{
struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
{
struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
- ctx->lzo_comp_mem = vmalloc(LZO1X_MEM_COMPRESS);
+ ctx->lzo_comp_mem = kmalloc(LZO1X_MEM_COMPRESS,
+ GFP_KERNEL | __GFP_NOWARN | __GFP_REPEAT);
+ if (!ctx->lzo_comp_mem)
+ ctx->lzo_comp_mem = vmalloc(LZO1X_MEM_COMPRESS);
if (!ctx->lzo_comp_mem)
return -ENOMEM;
if (!ctx->lzo_comp_mem)
return -ENOMEM;
@@
-41,7
+45,7
@@
static void lzo_exit(struct crypto_tfm *tfm)
{
struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
{
struct lzo_ctx *ctx = crypto_tfm_ctx(tfm);
- vfree(ctx->lzo_comp_mem);
+
k
vfree(ctx->lzo_comp_mem);
}
static int lzo_compress(struct crypto_tfm *tfm, const u8 *src,
}
static int lzo_compress(struct crypto_tfm *tfm, const u8 *src,