From d13fa07577c34aa7df76af378b62e487ce8f0114 Mon Sep 17 00:00:00 2001 From: lijiawei Date: Fri, 24 Jun 2022 11:50:26 +0800 Subject: [PATCH] enable config MEM_PURGEABLE and MEM_PURGEABLE_DEBUG ohos inclusion category: feature issue: I5DXK4 CVE: NA Signed-off-by: lijiawei Signed-off-by: Chengke Wang --- linux-5.10/arch/arm/configs/hispark_taurus_small_defconfig | 2 ++ linux-5.10/arch/arm/configs/hispark_taurus_standard_defconfig | 2 ++ linux-5.10/arch/arm/configs/small_common_defconfig | 2 ++ linux-5.10/arch/arm/configs/standard_common_defconfig | 2 ++ linux-5.10/arch/arm64/configs/rk3568_standard_defconfig | 3 +++ 5 files changed, 11 insertions(+) diff --git a/linux-5.10/arch/arm/configs/hispark_taurus_small_defconfig b/linux-5.10/arch/arm/configs/hispark_taurus_small_defconfig index 4238083..ec7d499 100755 --- a/linux-5.10/arch/arm/configs/hispark_taurus_small_defconfig +++ b/linux-5.10/arch/arm/configs/hispark_taurus_small_defconfig @@ -733,6 +733,8 @@ CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_FRAME_VECTOR=y # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_BENCHMARK is not set +# CONFIG_MEM_PURGEABLE is not set +# CONFIG_MEM_PURGEABLE_DEBUG is not set # end of Memory Management options CONFIG_NET=y diff --git a/linux-5.10/arch/arm/configs/hispark_taurus_standard_defconfig b/linux-5.10/arch/arm/configs/hispark_taurus_standard_defconfig index e0d9ea2..5287a92 100755 --- a/linux-5.10/arch/arm/configs/hispark_taurus_standard_defconfig +++ b/linux-5.10/arch/arm/configs/hispark_taurus_standard_defconfig @@ -668,6 +668,8 @@ CONFIG_FRAME_VECTOR=y # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_BENCHMARK is not set CONFIG_ANON_VMA_NAME=y +# CONFIG_MEM_PURGEABLE is not set +# CONFIG_MEM_PURGEABLE_DEBUG is not set CONFIG_NET=y # diff --git a/linux-5.10/arch/arm/configs/small_common_defconfig b/linux-5.10/arch/arm/configs/small_common_defconfig index 6e957bb..0161fb6 100644 --- a/linux-5.10/arch/arm/configs/small_common_defconfig +++ b/linux-5.10/arch/arm/configs/small_common_defconfig @@ -643,6 +643,8 @@ CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_FRAME_VECTOR=y # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_BENCHMARK is not set +# CONFIG_MEM_PURGEABLE is not set +# CONFIG_MEM_PURGEABLE_DEBUG is not set CONFIG_NET=y # diff --git a/linux-5.10/arch/arm/configs/standard_common_defconfig b/linux-5.10/arch/arm/configs/standard_common_defconfig index f69cd4f..b096222 100644 --- a/linux-5.10/arch/arm/configs/standard_common_defconfig +++ b/linux-5.10/arch/arm/configs/standard_common_defconfig @@ -632,6 +632,8 @@ CONFIG_FRAME_VECTOR=y # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_BENCHMARK is not set # CONFIG_ANON_VMA_NAME is not set +# CONFIG_MEM_PURGEABLE is not set +# CONFIG_MEM_PURGEABLE_DEBUG is not set CONFIG_NET=y # diff --git a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig index 5d70982..b25e650 100644 --- a/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig +++ b/linux-5.10/arch/arm64/configs/rk3568_standard_defconfig @@ -842,7 +842,10 @@ CONFIG_FRAME_VECTOR=y # CONFIG_PERCPU_STATS is not set # CONFIG_GUP_BENCHMARK is not set CONFIG_ARCH_HAS_PTE_SPECIAL=y +CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y CONFIG_ANON_VMA_NAME=y +CONFIG_MEM_PURGEABLE=y +CONFIG_MEM_PURGEABLE_DEBUG=y # Mem Debug CONFIG_RECLAIM_ACCT=y