From 7290f1e64b89005cec72c0b948f9ac9fd43263bb Mon Sep 17 00:00:00 2001 From: merge Date: Wed, 21 Jan 2009 20:02:15 +0000 Subject: MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-glamo-don-t-break-kernel-build-1232567797 pending-tracking-hist top was MERGE-via-stable-tracking-glamo-don-t-break-kernel-build-1232567797 / d9aa2ec4d0f11979eb9894dbcf0c1639e73a7587 ... parent commitmessage: From: merge MERGE-via-stable-tracking-hist-glamo-don-t-break-kernel-build stable-tracking-hist top was glamo-don-t-break-kernel-build / 1796c97b437a7bb998c489caba09a026bbb16564 ... parent commitmessage: From: Werner Almesberger Glamo: don't break kernel build if disabled If we disable CONFIG_MFD_GLAMO, a dependency on glamo_lcm_reset from arch/arm/mach-s3c2440/mach-gta02.c:gta02_jbt6k74_reset cannot be resolved. There are many ways to fix this - this one does it with a bit of a swagger ;-) Signed-off-by: Werner Almesberger --- drivers/net/ppp_deflate.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/ppp_deflate.c b/drivers/net/ppp_deflate.c index 034c1c650bc..222fc1a3a2c 100644 --- a/drivers/net/ppp_deflate.c +++ b/drivers/net/ppp_deflate.c @@ -306,7 +306,7 @@ static void z_decomp_free(void *arg) if (state) { zlib_inflateEnd(&state->strm); - kfree(state->strm.workspace); + vfree(state->strm.workspace); kfree(state); } } @@ -346,8 +346,7 @@ static void *z_decomp_alloc(unsigned char *options, int opt_len) state->w_size = w_size; state->strm.next_out = NULL; - state->strm.workspace = kmalloc(zlib_inflate_workspacesize(), - GFP_KERNEL|__GFP_REPEAT); + state->strm.workspace = vmalloc(zlib_inflate_workspacesize()); if (state->strm.workspace == NULL) goto out_free; -- cgit v1.2.3