summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarkus F.X.J. Oberhumer <markus@oberhumer.com>2012-08-13 17:24:24 +0200
committerMarkus F.X.J. Oberhumer <markus@oberhumer.com>2013-02-20 19:36:00 +0100
commitb6bec26cea948148a9420e7a0ac337f925de49e7 (patch)
tree79d76d19696b717e9cf032fee48dbc9fc13e066e /lib
parent19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff)
downloadlinux-3.10-b6bec26cea948148a9420e7a0ac337f925de49e7.tar.gz
linux-3.10-b6bec26cea948148a9420e7a0ac337f925de49e7.tar.bz2
linux-3.10-b6bec26cea948148a9420e7a0ac337f925de49e7.zip
lib/lzo: Rename lzo1x_decompress.c to lzo1x_decompress_safe.c
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>
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 4531294fa62..960183d4258 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 e764116ea12..f0f7d7ca2b8 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 f2fd0985022..f2fd0985022 100644
--- a/lib/lzo/lzo1x_decompress.c
+++ b/lib/lzo/lzo1x_decompress_safe.c