diff options
author | Dima Zavin <dima@android.com> | 2011-07-07 17:55:44 -0700 |
---|---|---|
committer | Dima Zavin <dima@android.com> | 2011-07-07 17:55:44 -0700 |
commit | 814cdea670616252e4cdf297a07b02ce59698bf1 (patch) | |
tree | c4a5665995e813c252b07f1e863166059bfb5bcb /crypto/deflate.c | |
parent | 487ffb052891a552fecf865ad4b24bbe7945a413 (diff) | |
parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) |
Merge commit 'v3.0-rc6' into android-3.0
Diffstat (limited to 'crypto/deflate.c')
-rw-r--r-- | crypto/deflate.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/crypto/deflate.c b/crypto/deflate.c index b5ccae29be74..b0165ecad0c5 100644 --- a/crypto/deflate.c +++ b/crypto/deflate.c @@ -32,7 +32,6 @@ #include <linux/interrupt.h> #include <linux/mm.h> #include <linux/net.h> -#include <linux/slab.h> #define DEFLATE_DEF_LEVEL Z_DEFAULT_COMPRESSION #define DEFLATE_DEF_WINBITS 11 @@ -73,7 +72,7 @@ static int deflate_decomp_init(struct deflate_ctx *ctx) int ret = 0; struct z_stream_s *stream = &ctx->decomp_stream; - stream->workspace = kzalloc(zlib_inflate_workspacesize(), GFP_KERNEL); + stream->workspace = vzalloc(zlib_inflate_workspacesize()); if (!stream->workspace) { ret = -ENOMEM; goto out; @@ -86,7 +85,7 @@ static int deflate_decomp_init(struct deflate_ctx *ctx) out: return ret; out_free: - kfree(stream->workspace); + vfree(stream->workspace); goto out; } @@ -99,7 +98,7 @@ static void deflate_comp_exit(struct deflate_ctx *ctx) static void deflate_decomp_exit(struct deflate_ctx *ctx) { zlib_inflateEnd(&ctx->decomp_stream); - kfree(ctx->decomp_stream.workspace); + vfree(ctx->decomp_stream.workspace); } static int deflate_init(struct crypto_tfm *tfm) |