Merge tag 'hardening-v6.2-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-block.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index 7834c9854e02662c9a0ddc7b9577789320330753..463c9295bc28a69b0fa3d32ee24c724010c1afb9 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -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>
@@ -786,8 +787,8 @@ static int __init panic_on_taint_setup(char *s)
        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;
 }