From 98e78e759fbc75da13169a3fa23794a6667afe41 Mon Sep 17 00:00:00 2001 From: Lijun Fang Date: Wed, 12 Jun 2019 12:16:30 +0800 Subject: [PATCH] mm/cdm: enable CONFIG_COHERENT_DEVICE in hulk_defconfig and syzkaller_defconfig hulk inclusion category: bugfix bugzilla: 16542 CVE: NA ------------------- enable CONFIG_COHERENT_DEVICE in hulk_defconfig and syzkaller_defconfig Signed-off-by: Lijun Fang Reviewed-by: Li Zefan Signed-off-by: Yang Yingliang --- arch/arm64/configs/hulk_defconfig | 2 +- arch/arm64/configs/syzkaller_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index 4121fbb78f8d..92afa4e0b9a0 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -415,7 +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 is not set +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 315cc7e99790..d885b3901d4f 100644 --- a/arch/arm64/configs/syzkaller_defconfig +++ b/arch/arm64/configs/syzkaller_defconfig @@ -416,7 +416,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 is not set +CONFIG_COHERENT_DEVICE=y CONFIG_HOLES_IN_ZONE=y # CONFIG_HZ_100 is not set CONFIG_HZ_250=y -- GitLab