aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarkus F.X.J. Oberhumer <markus@oberhumer.com>2012-08-13 17:24:24 +0200
committerBen Hutchings <ben@decadent.org.uk>2014-07-11 13:33:53 +0100
commitd83ff0c1d743320709de6522eff9e814abb041e8 (patch)
treeb2d8ceee7aeb096f0edd4867171b735db11b0746 /lib
parentcd58af052252f71479251d19605226cdb166899e (diff)
downloadkernel_samsung_smdk4412-d83ff0c1d743320709de6522eff9e814abb041e8.zip
kernel_samsung_smdk4412-d83ff0c1d743320709de6522eff9e814abb041e8.tar.gz
kernel_samsung_smdk4412-d83ff0c1d743320709de6522eff9e814abb041e8.tar.bz2
lib/lzo: Rename lzo1x_decompress.c to lzo1x_decompress_safe.c
commit b6bec26cea948148a9420e7a0ac337f925de49e7 upstream. Rename the source file to match the function name and thereby also make room for a possible future even slightly faster "non-safe" decompressor version. Signed-off-by: Markus F.X.J. Oberhumer <markus@oberhumer.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'lib')
-rw-r--r--lib/decompress_unlzo.c2
-rw-r--r--lib/lzo/Makefile2
-rw-r--r--lib/lzo/lzo1x_decompress_safe.c (renamed from lib/lzo/lzo1x_decompress.c)0
3 files changed, 2 insertions, 2 deletions
diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c
index 5a7a2ad..26f89ad 100644
--- a/lib/decompress_unlzo.c
+++ b/lib/decompress_unlzo.c
@@ -31,7 +31,7 @@
*/
#ifdef STATIC
-#include "lzo/lzo1x_decompress.c"
+#include "lzo/lzo1x_decompress_safe.c"
#else
#include <linux/decompress/unlzo.h>
#endif
diff --git a/lib/lzo/Makefile b/lib/lzo/Makefile
index e764116..f0f7d7c 100644
--- a/lib/lzo/Makefile
+++ b/lib/lzo/Makefile
@@ -1,5 +1,5 @@
lzo_compress-objs := lzo1x_compress.o
-lzo_decompress-objs := lzo1x_decompress.o
+lzo_decompress-objs := lzo1x_decompress_safe.o
obj-$(CONFIG_LZO_COMPRESS) += lzo_compress.o
obj-$(CONFIG_LZO_DECOMPRESS) += lzo_decompress.o
diff --git a/lib/lzo/lzo1x_decompress.c b/lib/lzo/lzo1x_decompress_safe.c
index f2fd098..f2fd098 100644
--- a/lib/lzo/lzo1x_decompress.c
+++ b/lib/lzo/lzo1x_decompress_safe.c