Skip to contentSkip to conversation

watchdog-handle-comma-separated-nmi_watchdog-command-line.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message May 6, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: watchdog: handle comma separated nmi_watchdog command line
has been removed from the -mm tree. Its filename was
watchdog-handle-comma-separated-nmi_watchdog-command-line.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: Song Liu <[email protected]>
Subject: watchdog: handle comma separated nmi_watchdog command line
Date: Mon, 29 Apr 2024 23:02:35 -0700

Per the document, the kernel can accept comma separated command line like nmi_watchdog=nopanic,0. However, the code doesn't really handle it. Fix the kernel to handle it properly.

---

 kernel/watchdog.c |    7 +++++++
 1 file changed, 7 insertions(+)
kernel/watchdog.c renamed from kernel/watchdog.c~watchdog-handle-comma-separated-nmi_watchdog-command-line +7 -0
@@ -71,6 +71,7 @@ void __init hardlockup_detector_disable(
 
 static int __init hardlockup_panic_setup(char *str)
 {
+next:
 	if (!strncmp(str, "panic", 5))
 		hardlockup_panic = 1;
 	else if (!strncmp(str, "nopanic", 7))
@@ -79,6 +80,12 @@ static int __init hardlockup_panic_setup
 		watchdog_hardlockup_user_enabled = 0;
 	else if (!strncmp(str, "1", 1))
 		watchdog_hardlockup_user_enabled = 1;
+	while (*(str++)) {
+		if (*str == ',') {
+			str++;
+			goto next;
+		}
+	}
 	return 1;
 }
 __setup("nmi_watchdog=", hardlockup_panic_setup);

_

Patches currently in -mm which might be from [email protected] are