Re: [PATCH 1/8] lib/lzo: tidy-up ifdefs

From: Markus F.X.J. Oberhumer
Date: Thu Dec 06 2018 - 10:49:42 EST


Acked-by: Markus F.X.J. Oberhumer <markus@xxxxxxxxxxxxx>


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.rodgman@xxxxxxx>
> Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
> Cc: David S. Miller <davem@xxxxxxxxxxxxx>
> Cc: Nitin Gupta <nitingupta910@xxxxxxxxx>
> Cc: Richard Purdie <rpurdie@xxxxxxxxxxxxxx>
> Cc: Markus F.X.J. Oberhumer <markus@xxxxxxxxxxxxx>
> Cc: Minchan Kim <minchan@xxxxxxxxxx>
> Cc: Sergey Senozhatsky <sergey.senozhatsky.work@xxxxxxxxx>
> Cc: Sonny Rao <sonnyrao@xxxxxxxxxx>
> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Cc: Matt Sealey <matt.sealey@xxxxxxx>
> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
> 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, <markus@xxxxxxxxxxxxx>, http://www.oberhumer.com/