+ watchdog-fix-watchdog-may-detect-false-positive-of-softlockup-fix.patch added to mm-nonmm-unstable branch

+ watchdog-fix-watchdog-may-detect-false-positive-of-softlockup-fix.patch added to mm-nonmm-unstable branch

[Andrew Morton]

The patch titled
     Subject: watchdog: fix the SOFTLOCKUP_DETECTOR=n case
has been added to the -mm mm-nonmm-unstable branch.  Its filename is
     watchdog-fix-watchdog-may-detect-false-positive-of-softlockup-fix.patch

This patch will shortly appear at
     https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/watchdog-fix-watchdog-may-detect-false-positive-of-softlockup-fix.patch

This patch will later appear in the mm-nonmm-unstable branch at
    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days

------------------------------------------------------
From: "Nysal Jan K.A." <nysal@linux.ibm.com>
Subject: watchdog: fix the SOFTLOCKUP_DETECTOR=n case
Date: Fri, 2 May 2025 16:41:20 +0530

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.com
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>
---

 kernel/watchdog.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- a/kernel/watchdog.c~watchdog-fix-watchdog-may-detect-false-positive-of-softlockup-fix
+++ a/kernel/watchdog.c
@@ -923,10 +923,12 @@ static __init void lockup_detector_setup
 }
 
 #else /* CONFIG_SOFTLOCKUP_DETECTOR */
-static void __lockup_detector_reconfigure(void)
+static void __lockup_detector_reconfigure(bool thresh_changed)
 {
 	cpus_read_lock();
 	watchdog_hardlockup_stop();
+	if (thresh_changed)
+		watchdog_thresh = READ_ONCE(watchdog_thresh_next);
 	lockup_detector_update_enable();
 	watchdog_hardlockup_start();
 	cpus_read_unlock();
_

Patches currently in -mm which might be from nysal@linux.ibm.com are

selftests-mm-fix-a-build-failure-on-powerpc.patch
watchdog-fix-watchdog-may-detect-false-positive-of-softlockup-fix.patch