From 14eb63aa9fbe62091cb394c134e51c05fb859224 Mon Sep 17 00:00:00 2001 From: Georgi Djakov Date: Wed, 6 Mar 2024 10:22:59 -0800 Subject: [PATCH] ANDROID: gki_defconfig: Enable PAGE_PINNER Enable the page pinner for both ARM64 and x86 to keep the configs consistent. The original patch enabled it only on ARM64. Bug: 240196534 Change-Id: Id69e8a49ffdc9983db9a592c5c74b15acadc7ad3 (cherry picked from commit 8b4906523a13d5f36def9abc31d07e8484d50cdc) Signed-off-by: Georgi Djakov --- arch/arm64/configs/gki_defconfig | 1 + arch/x86/configs/gki_defconfig | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 174a63cb3c56..ad56ec0c34eb 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -755,6 +755,7 @@ CONFIG_UBSAN_TRAP=y # CONFIG_UBSAN_BOOL is not set # CONFIG_UBSAN_ENUM is not set CONFIG_PAGE_OWNER=y +CONFIG_PAGE_PINNER=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_MEM_ALLOC_PROFILING=y # CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 79920144a5db..4e3626608ae9 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -684,6 +684,7 @@ CONFIG_UBSAN_TRAP=y # CONFIG_UBSAN_BOOL is not set # CONFIG_UBSAN_ENUM is not set CONFIG_PAGE_OWNER=y +CONFIG_PAGE_PINNER=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_MEM_ALLOC_PROFILING=y # CONFIG_MEM_ALLOC_PROFILING_ENABLED_BY_DEFAULT is not set