The quilt patch titled
Subject: watchdog/hardlockup: remove softlockup comment in touch_nmi_watchdog()
has been removed from the -mm tree. Its filename was
watchdog-hardlockup-remove-softlockup-comment-in-touch_nmi_watchdog.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Douglas Anderson <dianders@xxxxxxxxxxxx>
Subject: watchdog/hardlockup: remove softlockup comment in touch_nmi_watchdog()
Date: Fri, 26 May 2023 18:41:35 -0700
In the patch ("watchdog/hardlockup: add comments to touch_nmi_watchdog()")
we adjusted some comments for touch_nmi_watchdog(). The comment about the
softlockup had a typo and were also felt to be too obvious. Remove it.
Link: https://lkml.kernel.org/r/20230526184139.5.Ia593afc9eb12082d55ea6681dc2c5a89677f20a8@changeid
Signed-off-by: Douglas Anderson <dianders@xxxxxxxxxxxx>
Suggested-by: Petr Mladek <pmladek@xxxxxxxx>
Reviewed-by: Petr Mladek <pmladek@xxxxxxxx>
Cc: Christophe Leroy <christophe.leroy@xxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx>
Cc: Nicholas Piggin <npiggin@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/nmi.h | 4 ----
1 file changed, 4 deletions(-)
--- a/include/linux/nmi.h~watchdog-hardlockup-remove-softlockup-comment-in-touch_nmi_watchdog
+++ a/include/linux/nmi.h
@@ -140,10 +140,6 @@ static inline void touch_nmi_watchdog(vo
*/
arch_touch_nmi_watchdog();
- /*
- * Touching the hardlock detector implicitly resets the
- * softlockup detector too
- */
touch_softlockup_watchdog();
}
_
Patches currently in -mm which might be from dianders@xxxxxxxxxxxx are
