From: "Nysal Jan K.A" <nysal@linux.ibm.com> mm-unstable inclusion category: bugfix bugzilla: 190597 Reference: https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches... -------------------------------- Update watchdog_thresh when SOFTLOCKUP_DETECTOR=n. Additionally fix a build failure in this case as well. Link: https://lkml.kernel.org/r/20250502111120.282690-1-nysal@linux.ibm.com Reported-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> Closes: https://lore.kernel.org/all/339e2b3e-c7ee-418f-a84c-9c6360dc570b@linux.ibm.c... Signed-off-by: Nysal Jan K.A. <nysal@linux.ibm.com> Tested-by: Venkat Rao Bagalkote <venkat88@linux.ibm.com> Cc: Doug Anderson <dianders@chromium.org> Cc: Joel Granados <joel.granados@kernel.org> Cc: Luo Gengkun <luogengkun@huaweicloud.com> Cc: Song Liu <song@kernel.org> Cc: Thomas Gleinxer <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Conflicts: kernel/watchdog.c [Fix conflict due to the original patch is based on mainline] Signed-off-by: Luo Gengkun <luogengkun2@huawei.com> --- kernel/watchdog.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 5a286f6bd169..88be068e9922 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -620,10 +620,12 @@ static __init void lockup_detector_setup(void) } #else /* CONFIG_SOFTLOCKUP_DETECTOR */ -static void __lockup_detector_reconfigure(void) +static void __lockup_detector_reconfigure(bool thresh_changed) { cpus_read_lock(); nmi_watchdog_ops.watchdog_nmi_stop(); + if (thresh_changed) + watchdog_thresh = READ_ONCE(watchdog_thresh_next); lockup_detector_update_enable(); nmi_watchdog_ops.watchdog_nmi_start(); cpus_read_unlock(); -- 2.34.1