1 files changed, 27 insertions, 11 deletions

diff --git a/lib/lzo/lzodefs.h b/lib/lzo/lzodefs.h
index b6d482c492ef..6710b83ce72e 100644
--- a/lib/lzo/lzodefs.h
+++ b/lib/lzo/lzodefs.h
@@ -1,19 +1,37 @@
 /*
  *  lzodefs.h -- architecture, OS and compiler specific defines
  *
- *  Copyright (C) 1996-2005 Markus F.X.J. Oberhumer <markus@oberhumer.com>
+ *  Copyright (C) 1996-2012 Markus F.X.J. Oberhumer <markus@oberhumer.com>
  *
  *  The full LZO package can be found at:
  *  http://www.oberhumer.com/opensource/lzo/
  *
- *  Changed for kernel use by:
+ *  Changed for Linux kernel use by:
  *  Nitin Gupta <nitingupta910@gmail.com>
  *  Richard Purdie <rpurdie@openedhand.com>
  */
 
-#define LZO_VERSION             0x2020
-#define LZO_VERSION_STRING      "2.02"
-#define LZO_VERSION_DATE        "Oct 17 2005"
+
+#define COPY4(dst, src) \
+                put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst))
+#if defined(__x86_64__)
+#define COPY8(dst, src) \
+                put_unaligned(get_unaligned((const u64 *)(src)), (u64 *)(dst))
+#else
+#define COPY8(dst, src) \
+                COPY4(dst, src); COPY4((dst) + 4, (src) + 4)
+#endif
+
+#if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN)
+#error "conflicting endian definitions"
+#elif defined(__x86_64__)
+#define LZO_USE_CTZ64   1
+#define LZO_USE_CTZ32   1
+#elif defined(__i386__) || defined(__powerpc__)
+#define LZO_USE_CTZ32   1
+#elif defined(__arm__) && (__LINUX_ARM_ARCH__ >= 5)
+#define LZO_USE_CTZ32   1
+#endif
 
 #define M1_MAX_OFFSET   0x0400
 #define M2_MAX_OFFSET   0x0800
@@ -34,10 +52,8 @@
 #define M3_MARKER       32
 #define M4_MARKER       16
 
-#define D_BITS          14
-#define D_MASK          ((1u << D_BITS) - 1)
+#define lzo_dict_t      unsigned short
+#define D_BITS          13
+#define D_SIZE          (1u << D_BITS)
+#define D_MASK          (D_SIZE - 1)
 #define D_HIGH          ((D_MASK >> 1) + 1)
-
-#define DX2(p, s1, s2)  (((((size_t)((p)[2]) << (s2)) ^ (p)[1]) \
-                                                        << (s1)) ^ (p)[0])
-#define DX3(p, s1, s2, s3)      ((DX2((p)+1, s2, s3) << (s1)) ^ (p)[0])