Skip to contentSkip to conversation

panic-use-str_enabled_disabled-helper.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Nov 15, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: panic: use str_enabled_disabled() helper
has been removed from the -mm tree. Its filename was
panic-use-str_enabled_disabled-helper.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: Andy Shevchenko <[email protected]>
Subject: panic: use str_enabled_disabled() helper
Date: Sat, 8 Oct 2022 22:59:14 +0300

Use str_enabled_disabled() helper instead of open coding the same.

---

 kernel/panic.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
kernel/panic.c renamed from kernel/panic.c~panic-use-str_enabled_disabled-helper +3 -2
@@ -25,6 +25,7 @@
 #include <linux/kexec.h>
 #include <linux/panic_notifier.h>
 #include <linux/sched.h>
+#include <linux/string_helpers.h>
 #include <linux/sysrq.h>
 #include <linux/init.h>
 #include <linux/nmi.h>
@@ -744,8 +745,8 @@ static int __init panic_on_taint_setup(c
 	if (s && !strcmp(s, "nousertaint"))
 		panic_on_taint_nousertaint = true;
 
-	pr_info("panic_on_taint: bitmask=0x%lx nousertaint_mode=%sabled\n",
-		panic_on_taint, panic_on_taint_nousertaint ? "en" : "dis");
+	pr_info("panic_on_taint: bitmask=0x%lx nousertaint_mode=%s\n",
+		panic_on_taint, str_enabled_disabled(panic_on_taint_nousertaint));
 
 	return 0;
 }

_

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