]> err.no Git - linux-2.6/commit
[PATCH] zlib_inflate: Upgrade library code to a recent version
authorRichard Purdie <rpurdie@rpsys.net>
Thu, 22 Jun 2006 21:47:34 +0000 (14:47 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 22 Jun 2006 22:05:58 +0000 (15:05 -0700)
commit4f3865fb57a04db7cca068fed1c15badc064a302
tree4c923c72b6ac9b633c87cc73b55a75c7cfd0f044
parent4f1bcaf094ccc512c23e10104c05a6f8e5b7a9e4
[PATCH] zlib_inflate: Upgrade library code to a recent version

Upgrade the zlib_inflate implementation in the kernel from a patched
version 1.1.3/4 to a patched 1.2.3.

The code in the kernel is about seven years old and I noticed that the
external zlib library's inflate performance was significantly faster (~50%)
than the code in the kernel on ARM (and faster again on x86_32).

For comparison the newer deflate code is 20% slower on ARM and 50% slower
on x86_32 but gives an approx 1% compression ratio improvement.  I don't
consider this to be an improvement for kernel use so have no plans to
change the zlib_deflate code.

Various changes have been made to the zlib code in the kernel, the most
significant being the extra functions/flush option used by ppp_deflate.
This update reimplements the features PPP needs to ensure it continues to
work.

This code has been tested on ARM under both JFFS2 (with zlib compression
enabled) and ppp_deflate and on x86_32.  JFFS2 sees an approx.  10% real
world file read speed improvement.

This patch also removes ZLIB_VERSION as it no longer has a correct value.
We don't need version checks anyway as the kernel's module handling will
take care of that for us.  This removal is also more in keeping with the
zlib author's wishes (http://www.zlib.net/zlib_faq.html#faq24) and I've
added something to the zlib.h header to note its a modified version.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Acked-by: Joern Engel <joern@wh.fh-wedel.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
24 files changed:
arch/powerpc/boot/Makefile
arch/ppc/boot/lib/Makefile
arch/xtensa/boot/lib/Makefile
include/linux/zconf.h
include/linux/zlib.h
include/linux/zutil.h
lib/zlib_deflate/deflate.c
lib/zlib_deflate/deflate_syms.c
lib/zlib_inflate/Makefile
lib/zlib_inflate/infblock.c [deleted file]
lib/zlib_inflate/infblock.h [deleted file]
lib/zlib_inflate/infcodes.c [deleted file]
lib/zlib_inflate/infcodes.h [deleted file]
lib/zlib_inflate/inffast.c
lib/zlib_inflate/inffast.h
lib/zlib_inflate/inffixed.h [new file with mode: 0644]
lib/zlib_inflate/inflate.c
lib/zlib_inflate/inflate.h [new file with mode: 0644]
lib/zlib_inflate/inflate_syms.c
lib/zlib_inflate/inflate_sync.c [deleted file]
lib/zlib_inflate/inftrees.c
lib/zlib_inflate/inftrees.h
lib/zlib_inflate/infutil.c [deleted file]
lib/zlib_inflate/infutil.h