From ec20ae62d21066fabe19be062f72b46e09fc13ef Mon Sep 17 00:00:00 2001 From: urain39 Date: Fri, 8 Jul 2022 00:48:47 +0800 Subject: [PATCH] lib/lzo: tidy-up ifdefs This commit same as mainline commit 95777591d07e08ebb95bb373237fcfbf54fcbf5c. --- 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 b0ce454264b6..c41eb61bd4c5 100644 --- a/lib/lzo/lzodefs.h +++ b/lib/lzo/lzodefs.h @@ -20,7 +20,7 @@ #define COPY4(dst, src) \ put_unaligned(get_unaligned((const u32 *)(src)), (u32 *)(dst)) -#if defined(__x86_64__) || defined(__aarch64__) +#if defined(CONFIG_X86_64) || defined(CONFIG_ARM64) #define COPY8(dst, src) \ put_unaligned(get_unaligned((const u64 *)(src)), (u64 *)(dst)) #else @@ -30,13 +30,13 @@ #if defined(__BIG_ENDIAN) && defined(__LITTLE_ENDIAN) #error "conflicting endian definitions" -#elif defined(__x86_64__) || defined(__aarch64__) +#elif defined(CONFIG_X86_64) || defined(CONFIG_ARM64) #define LZO_USE_CTZ64 1 #define LZO_USE_CTZ32 1 #define LZO_FAST_64BIT_MEMORY_ACCESS -#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