From 6c1091f111d5465f6cb1429e711b30971e4470ca Mon Sep 17 00:00:00 2001 From: Wooyeon Kim Date: Sun, 28 Apr 2019 13:39:36 +0900 Subject: [PATCH] [COMMON] fimc-is2: modified LIB_OFFSET for KASAN configs - If CONFIG_KASAN enabled, VMALLOC_START will be changed to "0xffffff9008000000" - for use DDK binary baseaddress always "0xffffff90~~" PR JIRA ID: CPR-983 Change-Id: Icd111141cfb5d5ff08c7a5d1446c0f5f30d55617 Signed-off-by: Wooyeon Kim --- .../media/platform/exynos/fimc-is2/include/fimc-is-binary.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/media/platform/exynos/fimc-is2/include/fimc-is-binary.h b/drivers/media/platform/exynos/fimc-is2/include/fimc-is-binary.h index 65699d0af4ee..278a7c83cb89 100644 --- a/drivers/media/platform/exynos/fimc-is2/include/fimc-is-binary.h +++ b/drivers/media/platform/exynos/fimc-is2/include/fimc-is-binary.h @@ -71,7 +71,12 @@ /* static reserved memory for libraries */ #define CDH_SIZE SZ_128K /* CDH : Camera Debug Helper */ +#ifdef CONFIG_KASAN #define LIB_OFFSET (VMALLOC_START + 0xF6000000 - 0x8000000) +#else +#define LIB_OFFSET (VMALLOC_START + 0x1000000000UL + 0xF6000000 - 0x8000000) +#endif + #define __LIB_START (LIB_OFFSET + 0x04000000 - CDH_SIZE) #define LIB_START (__LIB_START + CDH_SIZE) -- 2.20.1