Enable CONFIG_ARM64_NMI and HARDLOCK_DETECTOR to support NMI watchdog Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- arch/arm64/configs/tencent.config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/configs/tencent.config b/arch/arm64/configs/tencent.config index 752d43eeb1eb..a3accbedc048 100644 --- a/arch/arm64/configs/tencent.config +++ b/arch/arm64/configs/tencent.config @@ -1476,6 +1476,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_DEBUG_SHIRQ=y CONFIG_SDEI_WATCHDOG=y +CONFIG_HARDLOCKUP_DETECTOR=y CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_KILL_BLOCK=y CONFIG_PANIC_ON_OOPS=y @@ -1499,4 +1500,5 @@ CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_VIRT_PLAT_DEV=y CONFIG_VIRT_VTIMER_IRQ_BYPASS=y CONFIG_HISI_SOC_CACHE=m -CONFIG_HISI_SOC_HHA=m \ No newline at end of file +CONFIG_HISI_SOC_HHA=m +CONFIG_ARM64_NMI=y -- 2.25.1