From: Sasha Levin Date: Fri, 5 Jul 2019 14:07:44 +0000 (-0400) Subject: fixes for 4.9 X-Git-Tag: v5.1.17~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edf023870b7a5fc55171179ea5c8dcddae43ab85;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.9 Signed-off-by: Sasha Levin --- diff --git a/queue-4.9/series b/queue-4.9/series index 6273550f659..e22bdc7939d 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -90,3 +90,4 @@ lib-mpi-fix-karactx-leak-in-mpi_powm.patch drm-imx-notify-drm-core-before-sending-event-during-crtc-disable.patch drm-imx-only-send-event-on-crtc-disable-if-kept-disabled.patch btrfs-ensure-replaced-device-doesn-t-have-pending-chunk-allocation.patch +tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch diff --git a/queue-4.9/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch b/queue-4.9/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch new file mode 100644 index 00000000000..e2fa619e809 --- /dev/null +++ b/queue-4.9/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch @@ -0,0 +1,36 @@ +From e35873b6a478060bf9d8d299799a55ce9012a50c Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Mon, 6 May 2019 11:28:23 -0700 +Subject: tty: rocket: fix incorrect forward declaration of 'rp_init()' + +[ Upstream commit 423ea3255424b954947d167681b71ded1b8fca53 ] + +Make the forward declaration actually match the real function +definition, something that previous versions of gcc had just ignored. + +This is another patch to fix new warnings from gcc-9 before I start the +merge window pulls. I don't want to miss legitimate new warnings just +because my system update brought a new compiler with new warnings. + +Signed-off-by: Linus Torvalds +Signed-off-by: Sasha Levin +--- + drivers/tty/rocket.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c +index e8e8973939d3..447d791bde22 100644 +--- a/drivers/tty/rocket.c ++++ b/drivers/tty/rocket.c +@@ -279,7 +279,7 @@ MODULE_PARM_DESC(pc104_3, "set interface types for ISA(PC104) board #3 (e.g. pc1 + module_param_array(pc104_4, ulong, NULL, 0); + MODULE_PARM_DESC(pc104_4, "set interface types for ISA(PC104) board #4 (e.g. pc104_4=232,232,485,485,..."); + +-static int rp_init(void); ++static int __init rp_init(void); + static void rp_cleanup_module(void); + + module_init(rp_init); +-- +2.20.1 +