Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-16 16:23:44 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-16 16:23:46 +0200
commitb24490c0bdf63e9cf3db9d8774ec8b6a3873d747 (patch)
tree1a160038217488805f47992c356c6844cb133ea4
parent017d54c87ba197f147470df44106c3344fb065d6 (diff)
tty: rocket: fix incorrect forward declaration of 'rp_init()'
(bsc#1051510).
-rw-r--r--patches.drivers/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch38
-rw-r--r--series.conf1
2 files changed, 39 insertions, 0 deletions
diff --git a/patches.drivers/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch b/patches.drivers/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch
new file mode 100644
index 0000000000..e6a05966ce
--- /dev/null
+++ b/patches.drivers/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch
@@ -0,0 +1,38 @@
+From 423ea3255424b954947d167681b71ded1b8fca53 Mon Sep 17 00:00:00 2001
+From: Linus Torvalds <torvalds@linux-foundation.org>
+Date: Mon, 6 May 2019 11:28:23 -0700
+Subject: [PATCH] tty: rocket: fix incorrect forward declaration of 'rp_init()'
+Git-commit: 423ea3255424b954947d167681b71ded1b8fca53
+Patch-mainline: v5.2-rc1
+References: bsc#1051510
+
+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 <torvalds@linux-foundation.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ 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 b121d8f8f3d7..27aeca30eeae 100644
+--- a/drivers/tty/rocket.c
++++ b/drivers/tty/rocket.c
+@@ -266,7 +266,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.16.4
+
diff --git a/series.conf b/series.conf
index 96751333d4..c0ee95db17 100644
--- a/series.conf
+++ b/series.conf
@@ -22223,6 +22223,7 @@
patches.fixes/Abort-file_remove_privs-for-non-reg.-files.patch
patches.fixes/ufs-fix-braino-in-ufs_get_inode_gid-for-solaris-UFS-.patch
patches.arch/x86-mm-mem_encrypt-disable-all-instrumentation-for-early-sme-setup.patch
+ patches.drivers/tty-rocket-fix-incorrect-forward-declaration-of-rp_i.patch
patches.arch/cpu-speculation-add-mitigations-cmdline-option.patch
patches.arch/x86-speculation-support-mitigations-cmdline-option.patch
patches.arch/powerpc-speculation-support-mitigations-cmdline-option.patch