From ef1134dd04cb1dc8479cf8666f70ebb8d12b224f Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Tue, 7 Jun 2022 11:49:59 -0700 Subject: [PATCH] ANDROID: gki_defconfig: enable CONFIG_KFENCE_STATIC_KEYS The default value of this option changed recently in 4f612ed3f748 ("kfence: default to dynamic branch instead of static keys mode"). As there was no functional change here and no concern posed about configurations relevant to Android, re-enable this option. Bug: 234805737 Signed-off-by: Steve Muckle Change-Id: I5b20a67225cd247fc54547083b3cbcde0135f1fb --- 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 4d62442e4419..aead08f0b820 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -667,6 +667,7 @@ CONFIG_KASAN_HW_TAGS=y CONFIG_KFENCE=y CONFIG_KFENCE_SAMPLE_INTERVAL=500 CONFIG_KFENCE_NUM_OBJECTS=63 +CONFIG_KFENCE_STATIC_KEYS=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 CONFIG_SOFTLOCKUP_DETECTOR=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 09fa20280daa..c2f180297c8c 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -608,6 +608,7 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_KFENCE=y CONFIG_KFENCE_SAMPLE_INTERVAL=500 CONFIG_KFENCE_NUM_OBJECTS=63 +CONFIG_KFENCE_STATIC_KEYS=y CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 CONFIG_SOFTLOCKUP_DETECTOR=y