From 5b180811875fa2ad34a95ee2fea7a5f455ca5dda Mon Sep 17 00:00:00 2001 From: Lijun Fang Date: Mon, 13 May 2019 22:39:45 +0800 Subject: [PATCH] enable COHERENT_DEVICE in hulk_defconfig and syzkaller_cefconfig euler inclusion category: feature bugzilla: 11082 CVE: NA ----------------- Enable config COHERENT_DEVICE by default. Signed-off-by: Lijun Fang Reviewed-by: zhong jiang Signed-off-by: Yang Yingliang --- arch/arm64/configs/hulk_defconfig | 1 + arch/arm64/configs/syzkaller_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index 914a4b81608c..0cd60e984c63 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -414,6 +414,7 @@ CONFIG_NODES_SHIFT=3 CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_COHERENT_DEVICE=y CONFIG_HOLES_IN_ZONE=y # CONFIG_HZ_100 is not set CONFIG_HZ_250=y diff --git a/arch/arm64/configs/syzkaller_defconfig b/arch/arm64/configs/syzkaller_defconfig index 48666c708522..369ef8f78702 100644 --- a/arch/arm64/configs/syzkaller_defconfig +++ b/arch/arm64/configs/syzkaller_defconfig @@ -415,6 +415,7 @@ CONFIG_NODES_SHIFT=3 CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y +CONFIG_COHERENT_DEVICE=y CONFIG_HOLES_IN_ZONE=y # CONFIG_HZ_100 is not set CONFIG_HZ_250=y -- GitLab