From f222c3c482e51e8d3ce57e00e44afbcf4d08a652 Mon Sep 17 00:00:00 2001 From: Xiongfeng Wang Date: Thu, 18 Apr 2019 16:01:44 +0800 Subject: [PATCH] arm64: hulk_defconfig: remove CONFIG_HARDLOCKUP_CHECK_TIMESTAMP euler inclusion category: feature Bugzilla: 5515 CVE: N/A ---------------------------------------- After introducing setting period for the secure timer. We disselect CONFIG_HARDLOCKUP_CHECK_TIMESTAMP for CONFIG_SDEI_WATCHDOG. So update the hulk_defconfig. Signed-off-by: Xiongfeng Wang Reviewed-by: Hanjun Guo Signed-off-by: Yang Yingliang --- arch/arm64/configs/hulk_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index f070422854bd..1113b05cdfbe 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -5455,7 +5455,6 @@ CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0 CONFIG_SDEI_WATCHDOG=y # CONFIG_PMU_WATCHDOG is not set -CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y CONFIG_HARDLOCKUP_DETECTOR=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1 -- GitLab