From ef4ff626b3921e7a4cd371884507e231e9c6e6db Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Thu, 15 Apr 2021 17:48:38 +0200 Subject: [PATCH] ANDROID: gki_defconfig: temporarily disable KFENCE in GKI Temporarily disable KFENCE to investigate a power regression we've encountered on idle systems. There is a potential fix already, but we don't want to further block the performance team. Bug: 185280916 Test: build Signed-off-by: Alexander Potapenko Change-Id: Ic5e4f48b48d9c059e3087f85e9edcb6921bee012 --- arch/arm64/configs/gki_defconfig | 2 +- arch/x86/configs/gki_defconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 1e55053b8fef..62bd427a4584 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -642,7 +642,7 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_KASAN=y CONFIG_KASAN_HW_TAGS=y CONFIG_KFENCE=y -CONFIG_KFENCE_SAMPLE_INTERVAL=500 +CONFIG_KFENCE_SAMPLE_INTERVAL=0 CONFIG_KFENCE_NUM_OBJECTS=63 CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 60647931c045..7a4ba70e0db1 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -580,7 +580,7 @@ CONFIG_PAGE_OWNER=y CONFIG_DEBUG_STACK_USAGE=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_KFENCE=y -CONFIG_KFENCE_SAMPLE_INTERVAL=500 +CONFIG_KFENCE_SAMPLE_INTERVAL=0 CONFIG_KFENCE_NUM_OBJECTS=63 CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1