From 54e36b8166d61e6cd1d57e2fee3e944f1e27934b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Mon, 11 Sep 2017 10:24:36 +0200 Subject: [PATCH] Follow split of LOCKUP_DETECTOR The config option LOCKUP_DETECTOR was split upstream in 05a4a9527931 ("kernel/watchdog: split up config options") The old setting LOCKUP_DETECTOR=y is equivalent to enabling the soft and hard detector now. --- debian/config/config | 3 ++- debian/config/hppa/config | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/config/config b/debian/config/config index dee20ae57..910183f74 100644 --- a/debian/config/config +++ b/debian/config/config @@ -6077,7 +6077,8 @@ CONFIG_DEBUG_MEMORY_INIT=y CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m # CONFIG_DEBUG_HIGHMEM is not set # CONFIG_KCOV is not set -CONFIG_LOCKUP_DETECTOR=y +CONFIG_SOFTLOCKUP_DETECTOR=y +CONFIG_HARDLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set # CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set CONFIG_DETECT_HUNG_TASK=y diff --git a/debian/config/hppa/config b/debian/config/hppa/config index f7a613e29..6f79f091a 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -548,7 +548,8 @@ CONFIG_SYSFS_SYSCALL=y ## file: lib/Kconfig.debug ## CONFIG_DEBUG_STACKOVERFLOW=y -# CONFIG_LOCKUP_DETECTOR is not set +# CONFIG_SOFTLOCKUP_DETECTOR is not set +# CONFIG_HARDLOCKUP_DETECTOR is not set ## ## file: mm/Kconfig