diff options
author | Alexey Brodkin <abrodkin@synopsys.com> | 2017-09-08 23:12:59 +0300 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2017-10-03 20:36:49 -0700 |
commit | 9583833e9e3628177661e815e5ce80dd3955d82f (patch) | |
tree | 17f92224148779c3284290f9f2822d85fc51ec01 /arch/arc/configs/axs101_defconfig | |
parent | 976e78a5226598cb582fe9ef98a72861adbc0e9c (diff) | |
download | talos-obmc-linux-9583833e9e3628177661e815e5ce80dd3955d82f.tar.gz talos-obmc-linux-9583833e9e3628177661e815e5ce80dd3955d82f.zip |
ARC: [*defconfig] Reenable soft lock-up detector
Commit 92e5aae45778 "kernel/watchdog: split up config options"
introduced SOFTLOCKUP_DETECTOR which selects LOCKUP_DETECTOR
instead of the latter to be selected itself.
We need to adjust our defconfigs accordingly.
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc/configs/axs101_defconfig')
-rw-r--r-- | arch/arc/configs/axs101_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arc/configs/axs101_defconfig b/arch/arc/configs/axs101_defconfig index 6980b966a364..ec7c849a5c8e 100644 --- a/arch/arc/configs/axs101_defconfig +++ b/arch/arc/configs/axs101_defconfig @@ -105,7 +105,7 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_ENABLE_WARN_DEPRECATED is not set # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_STRIP_ASM_SYMS=y -CONFIG_LOCKUP_DETECTOR=y +CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10 # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_PREEMPT is not set |