From 122a2dad2285a1a2d63a545731e9fa14dfd5fa3e Mon Sep 17 00:00:00 2001 From: Quentin Perret Date: Tue, 23 Jun 2020 11:24:00 +0100 Subject: [PATCH] ANDROID: gki_defconfig: Enable CONFIG_WQ_WATCHDOG It is useful to some partners to debug in-field lockups, and can disabled by those who don't need it via command line or sysfs. Bug: 159101622 Signed-off-by: Quentin Perret Change-Id: I14d2b112d2d4d1a4a920c71f254fc4ba4d3cd57c --- 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 461f51213f5f..d41bb2cdae24 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig @@ -499,6 +499,7 @@ CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_DETECT_HUNG_TASK is not set +CONFIG_WQ_WATCHDOG=y CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_PREEMPT is not set CONFIG_BUG_ON_DATA_CORRUPTION=y diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index faedb2dd3b6a..1760750b25bc 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig @@ -446,6 +446,7 @@ CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=-1 CONFIG_SOFTLOCKUP_DETECTOR=y # CONFIG_DETECT_HUNG_TASK is not set +CONFIG_WQ_WATCHDOG=y CONFIG_SCHEDSTATS=y CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_UNWINDER_FRAME_POINTER=y