This is a note to let you know that I've just added the patch titled
sh: nmi_debug: fix return value of __setup handler
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sh-nmi_debug-fix-return-value-of-__setup-handler.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d1155e4132de712a9d3066e2667ceaad39a539c5 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Date: Sun, 5 Mar 2023 20:00:32 -0800
Subject: sh: nmi_debug: fix return value of __setup handler
From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
commit d1155e4132de712a9d3066e2667ceaad39a539c5 upstream.
__setup() handlers should return 1 to obsolete_checksetup() in
init/main.c to indicate that the boot option has been handled.
A return of 0 causes the boot option/value to be listed as an Unknown
kernel parameter and added to init's (limited) argument or environment
strings. Also, error return codes don't mean anything to
obsolete_checksetup() -- only non-zero (usually 1) or zero.
So return 1 from nmi_debug_setup().
Fixes: 1e1030dccb10 ("sh: nmi_debug support.")
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Reported-by: Igor Zhbanov <izh1979@xxxxxxxxx>
Link: lore.kernel.org/r/64644a2f-4a20-bab3-1e15-3b2cdd0defe3@xxxxxxxxxxxx
Cc: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
Cc: Yoshinori Sato <ysato@xxxxxxxxxxxxxxxxxxxx>
Cc: Rich Felker <dalias@xxxxxxxx>
Cc: linux-sh@xxxxxxxxxxxxxxx
Cc: stable@xxxxxxxxxxxxxxx
Reviewed-by: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230306040037.20350-3-rdunlap@xxxxxxxxxxxxx
Signed-off-by: John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/sh/kernel/nmi_debug.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/arch/sh/kernel/nmi_debug.c
+++ b/arch/sh/kernel/nmi_debug.c
@@ -49,7 +49,7 @@ static int __init nmi_debug_setup(char *
register_die_notifier(&nmi_debug_nb);
if (*str != '=')
- return 0;
+ return 1;
for (p = str + 1; *p; p = sep + 1) {
sep = strchr(p, ',');
@@ -70,6 +70,6 @@ static int __init nmi_debug_setup(char *
break;
}
- return 0;
+ return 1;
}
__setup("nmi_debug", nmi_debug_setup);
Patches currently in stable-queue which might be from rdunlap@xxxxxxxxxxxxx are
queue-5.10/leds-ti_lmu_common-select-regmap-instead-of-dependin.patch
queue-5.10/linux-vt_buffer.h-allow-either-builtin-or-modular-fo.patch
queue-5.10/sound-oss-dmasound-fix-dmasound_setup-defined-but-not-used.patch
queue-5.10/powerpc-sysdev-tsi108-fix-resource-printk-format-war.patch
queue-5.10/sh-nmi_debug-fix-return-value-of-__setup-handler.patch
queue-5.10/ipmi-aspeed_bt_ipmi_bmc-select-regmap_mmio-instead-o.patch
queue-5.10/sh-mcount.s-fix-build-error-when-printk-is-not-enabled.patch
queue-5.10/ia64-mm-contig-fix-section-mismatch-warning-error.patch
queue-5.10/sh-math-emu-fix-macro-redefined-warning.patch
queue-5.10/ia64-salinfo-placate-defined-but-not-used-warning.patch
queue-5.10/sound-oss-dmasound-fix-build-when-drivers-are-mixed-y-m.patch
queue-5.10/driver-core-don-t-require-dynamic_debug-for-initcall_debug-probe-timing.patch
queue-5.10/ima-allow-fix-uml-builds.patch
queue-5.10/sh-init-use-of_early_flattree-for-early-init.patch
queue-5.10/powerpc-wii-fix-resource-printk-format-warnings.patch
queue-5.10/powerpc-mpc512x-fix-resource-printk-format-warning.patch
queue-5.10/macintosh-via-pmu-led-requires-ata-to-be-set.patch
