Acked-by: Markus F.X.J. Oberhumer <mar...@oberhumer.com>
On 2018-11-30 15:26, Dave Rodgman wrote: > Modify the ifdefs in lzodefs.h to be more consistent with normal kernel > macros (e.g., change __aarch64__ to CONFIG_ARM64). > > Signed-off-by: Dave Rodgman <dave.rodg...@arm.com> > Cc: Herbert Xu <herb...@gondor.apana.org.au> > Cc: David S. Miller <da...@davemloft.net> > Cc: Nitin Gupta <nitingupta...@gmail.com> > Cc: Richard Purdie <rpur...@openedhand.com> > Cc: Markus F.X.J. Oberhumer <mar...@oberhumer.com> > Cc: Minchan Kim <minc...@kernel.org> > Cc: Sergey Senozhatsky <sergey.senozhatsky.w...@gmail.com> > Cc: Sonny Rao <sonny...@google.com> > Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org> > Cc: Matt Sealey <matt.sea...@arm.com> > Signed-off-by: Andrew Morton <a...@linux-foundation.org> > Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au> > --- > lib/lzo/lzodefs.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/lib/lzo/lzodefs.h b/lib/lzo/lzodefs.h > index 4edefd2f540c..497f9c9f03a8 100644 > --- a/lib/lzo/lzodefs.h > +++ b/lib/lzo/lzodefs.h > @@ -15,7 +15,7 @@ > > #define COPY4(dst, src) \ > put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst)) > -#if defined(__x86_64__) > +#if defined(CONFIG_X86_64) > #define COPY8(dst, src) \ > put_unaligned(get_unaligned((const u64 *)(src)), (u64 *)(dst)) > #else > @@ -25,12 +25,12 @@ > > #if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN) > #error "conflicting endian definitions" > -#elif defined(__x86_64__) > +#elif defined(CONFIG_X86_64) > #define LZO_USE_CTZ64 1 > #define LZO_USE_CTZ32 1 > -#elif defined(__i386__) || defined(__powerpc__) > +#elif defined(CONFIG_X86) || defined(CONFIG_PPC) > #define LZO_USE_CTZ32 1 > -#elif defined(__arm__) && (__LINUX_ARM_ARCH__ >= 5) > +#elif defined(CONFIG_ARM) && (__LINUX_ARM_ARCH__ >= 5) > #define LZO_USE_CTZ32 1 > #endif > > -- Markus Oberhumer, <mar...@oberhumer.com>, http://www.oberhumer.com/
