From a602ecdaf763c785c64d321dba182776889cfad7 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 5 Jul 2019 10:07:44 -0400 Subject: [PATCH] fixes for 4.4 Signed-off-by: Sasha Levin --- queue-4.4/series | 1 + ...ncorrect-forward-declaration-of-rp_i.patch | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 queue-4.4/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch diff --git a/queue-4.4/series b/queue-4.4/series index 5c5bafcce9e..1ff0e7d06a6 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -66,3 +66,4 @@ alsa-firewire-lib-fireworks-fix-miss-detection-of-received-midi-messages.patch alsa-usb-audio-fix-sign-unintended-sign-extension-on-left-shifts.patch lib-mpi-fix-karactx-leak-in-mpi_powm.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.4/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch b/queue-4.4/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch new file mode 100644 index 00000000000..a0e680bb3ff --- /dev/null +++ b/queue-4.4/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch @@ -0,0 +1,36 @@ +From 42f6f54552d84a306804ff85860e065631aa0e24 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 2b8f2e0a4224..ec6d20f25e8b 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 + -- 2.47.2