From 32db8e6e8020d1d9794ccfb1aec754d280523a36 Mon Sep 17 00:00:00 2001 From: Youngmin Nam Date: Thu, 2 May 2019 16:36:42 +0900 Subject: [PATCH] compiler: fix conflict related kasan during updating 4.14.113 Change-Id: Ia5de6644c02f83bbdb291886bb664f7d921fa59c Signed-off-by: Youngmin Nam --- include/linux/compiler-clang.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/linux/compiler-clang.h b/include/linux/compiler-clang.h index f08ff252cc45..0b72ac7828d4 100644 --- a/include/linux/compiler-clang.h +++ b/include/linux/compiler-clang.h @@ -34,14 +34,13 @@ #define __nocfi __attribute__((no_sanitize("cfi"))) #endif -<<<<<<< HEAD /* all clang versions usable with the kernel support KASAN ABI version 5 */ #define KASAN_ABI_VERSION 5 /* emulate gcc's __SANITIZE_ADDRESS__ flag */ #if __has_feature(address_sanitizer) #define __SANITIZE_ADDRESS__ -======= +#endif /* * Not all versions of clang implement the the type-generic versions * of the builtin overflow checkers. Fortunately, clang implements @@ -54,5 +53,4 @@ __has_builtin(__builtin_add_overflow) && \ __has_builtin(__builtin_sub_overflow) #define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1 ->>>>>>> android-4.14-p #endif -- 2.20.1