On Mon, Mar 20, 2023 at 03:55:03PM +0100, Greg Kroah-Hartman wrote:
> From: Kees Cook <keescook@xxxxxxxxxxxx>
>
> [ Upstream commit b13fecb1c3a603c4b8e99b306fecf4f668c11b32 ]
>
> This converts all the existing DECLARE_TASKLET() (and ...DISABLED)
> macros with DECLARE_TASKLET_OLD() in preparation for refactoring the
> tasklet callback type. All existing DECLARE_TASKLET() users had a "0"
> data argument, it has been removed here as well.
>
> Reviewed-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> Acked-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
> Stable-dep-of: 1fdeb8b9f29d ("wifi: iwl3945: Add missing check for create_singlethread_workqueue")
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> [Tom: fix backport to 5.4.y]
>
> AUTOSEL backport to 5.4.y of:
> b13fecb1c3a6 ("treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD()")
> changed all locations of DECLARE_TASKLET with DECLARE_TASKLET_OLD,
> except one, in arch/mips/lasat/pcivue_proc.c.
>
> This is due to:
> 10760dde9be3 ("MIPS: Remove support for LASAT") preceeding
> b13fecb1c3a6 ("treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD()")
> upstream and the former not being present in 5.4.y.
>
> Fix this by changing DECLARE_TASKLET to DECLARE_TASKLET_OLD in
> arch/mips/lasat/pcivue_proc.c.
>
> Fixes: 5de7a4254eb2 ("treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD()")
> Reported-by: "kernelci.org bot" <bot@xxxxxxxxxxxx>
> Signed-off-by: Tom Saeger <tom.saeger@xxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> arch/mips/lasat/picvue_proc.c | 2 +-
> drivers/input/keyboard/omap-keypad.c | 2 +-
> drivers/input/serio/hil_mlc.c | 2 +-
> drivers/net/wan/farsync.c | 4 ++--
> drivers/s390/crypto/ap_bus.c | 2 +-
> drivers/staging/most/dim2/dim2.c | 2 +-
> drivers/staging/octeon/ethernet-tx.c | 2 +-
> drivers/tty/vt/keyboard.c | 2 +-
> drivers/usb/gadget/udc/snps_udc_core.c | 2 +-
> drivers/usb/host/fhci-sched.c | 2 +-
> include/linux/interrupt.h | 15 ++++++++++-----
> kernel/backtracetest.c | 2 +-
> kernel/debug/debug_core.c | 2 +-
> kernel/irq/resend.c | 2 +-
> net/atm/pppoatm.c | 2 +-
> net/iucv/iucv.c | 2 +-
> sound/drivers/pcsp/pcsp_lib.c | 2 +-
> 17 files changed, 27 insertions(+), 22 deletions(-)
>
> --- a/arch/mips/lasat/picvue_proc.c
> +++ b/arch/mips/lasat/picvue_proc.c
> @@ -39,7 +39,7 @@ static void pvc_display(unsigned long da
> pvc_write_string(pvc_lines[i], 0, i);
> }
>
> -static DECLARE_TASKLET(pvc_display_tasklet, &pvc_display, 0);
> +static DECLARE_TASKLET_OLD(pvc_display_tasklet, &pvc_display, 0);
+static DECLARE_TASKLET_OLD(pvc_display_tasklet, &pvc_display);
Mea culpa. The above needs drop last parameter.
I confirmed this locally with a gcc-10 mips build of lasat_defconfig.
>
> static int pvc_line_proc_show(struct seq_file *m, void *v)
> {
--Tom
