From 2c1cfeb9749e04ff8e2cddacfe4ca95b2548578b Mon Sep 17 00:00:00 2001 From: Petri Gynther Date: Fri, 11 Feb 2022 11:09:17 -0800 Subject: [PATCH] ANDROID: GKI: enable softlockup detector Enable kernel softlockup detector to mirror android13-5.15 GKI config. If desired, this feature can be disabled with command line parameter: nowatchdog (or nosoftlockup) Bug: 168445946 Signed-off-by: Petri Gynther Change-Id: I1df3f9a7da225b0bc2755b244d14100929f7c85f --- 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 88755d1adeb1..4e00698eb76e 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -693,7 +693,7 @@ CONFIG_KFENCE_SAMPLE_INTERVAL=500 CONFIG_KFENCE_NUM_OBJECTS=63 CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 -CONFIG_DETECT_HUNG_TASK=y +CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_WQ_WATCHDOG=y CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_PREEMPT is not set diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index 371dc3f0f84d..f2405d9489d5 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -624,7 +624,7 @@ CONFIG_KFENCE_SAMPLE_INTERVAL=500 CONFIG_KFENCE_NUM_OBJECTS=63 CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 -CONFIG_DETECT_HUNG_TASK=y +CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_WQ_WATCHDOG=y CONFIG_SCHEDSTATS=y CONFIG_BUG_ON_DATA_CORRUPTION=y