diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 16:38:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-06-03 16:38:40 +1000 |
| commit | afccb0538481f64fda82abe401619e34ecef67a3 (patch) | |
| tree | f89147dad4361628d0d4c7fe73ed3d04efd5fc7c | |
| parent | c8540b382f51dba8ad25bbaabac7fe373321c16d (diff) | |
| parent | 42b775abafafdf811ef300e869a4e1480ef1cf95 (diff) | |
Merge remote-tracking branch 'lzo-update/lzo-update'
| -rw-r--r-- | lib/lzo/lzo1x_decompress_safe.c | 4 | ||||
| -rw-r--r-- | lib/lzo/lzodefs.h | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/lib/lzo/lzo1x_decompress_safe.c b/lib/lzo/lzo1x_decompress_safe.c index 569985d522d..e3edc5f3f5e 100644 --- a/lib/lzo/lzo1x_decompress_safe.c +++ b/lib/lzo/lzo1x_decompress_safe.c @@ -72,9 +72,11 @@ copy_literal_run: COPY8(op, ip); op += 8; ip += 8; +# if !defined(__arm__) COPY8(op, ip); op += 8; ip += 8; +# endif } while (ip < ie); ip = ie; op = oe; @@ -159,9 +161,11 @@ copy_literal_run: COPY8(op, m_pos); op += 8; m_pos += 8; +# if !defined(__arm__) COPY8(op, m_pos); op += 8; m_pos += 8; +# endif } while (op < oe); op = oe; if (HAVE_IP(6)) { diff --git a/lib/lzo/lzodefs.h b/lib/lzo/lzodefs.h index 6710b83ce72..db756ccb275 100644 --- a/lib/lzo/lzodefs.h +++ b/lib/lzo/lzodefs.h @@ -12,8 +12,14 @@ */ +#if 1 && defined(__arm__) && ((__LINUX_ARM_ARCH__ >= 6) || defined(__ARM_FEATURE_UNALIGNED)) +#define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS 1 +#define COPY4(dst, src) \ + * (u32 *) (void *) (dst) = * (const u32 *) (const void *) (src) +#else #define COPY4(dst, src) \ put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst)) +#endif #if defined(__x86_64__) #define COPY8(dst, src) \ put_unaligned(get_unaligned((const u64 *)(src)), (u64 *)(dst)) |