From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 24 Jan 2018 19:00:00 +0000 (+0100)
Subject: 4.9-stable patches
X-Git-Tag: v4.4.114~33
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e63461d2baad5a71dcbf9b16497a871003623c2;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	revert-module-add-retpoline-tag-to-vermagic.patch
---

diff --git a/queue-4.9/revert-module-add-retpoline-tag-to-vermagic.patch b/queue-4.9/revert-module-add-retpoline-tag-to-vermagic.patch
new file mode 100644
index 00000000000..6310e1a1479
--- /dev/null
+++ b/queue-4.9/revert-module-add-retpoline-tag-to-vermagic.patch
@@ -0,0 +1,51 @@
+From 5132ede0fe8092b043dae09a7cc32b8ae7272baa Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Wed, 24 Jan 2018 15:28:17 +0100
+Subject: Revert "module: Add retpoline tag to VERMAGIC"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+commit 5132ede0fe8092b043dae09a7cc32b8ae7272baa upstream.
+
+This reverts commit 6cfb521ac0d5b97470883ff9b7facae264b7ab12.
+
+Turns out distros do not want to make retpoline as part of their "ABI",
+so this patch should not have been merged.  Sorry Andi, this was my
+fault, I suggested it when your original patch was the "correct" way of
+doing this instead.
+
+Reported-by: Jiri Kosina <jikos@kernel.org>
+Fixes: 6cfb521ac0d5 ("module: Add retpoline tag to VERMAGIC")
+Acked-by: Andi Kleen <ak@linux.intel.com>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: David Woodhouse <dwmw@amazon.co.uk>
+Cc: rusty@rustcorp.com.au
+Cc: arjan.van.de.ven@intel.com
+Cc: jeyu@kernel.org
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/vermagic.h |    8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+--- a/include/linux/vermagic.h
++++ b/include/linux/vermagic.h
+@@ -24,16 +24,10 @@
+ #ifndef MODULE_ARCH_VERMAGIC
+ #define MODULE_ARCH_VERMAGIC ""
+ #endif
+-#ifdef RETPOLINE
+-#define MODULE_VERMAGIC_RETPOLINE "retpoline "
+-#else
+-#define MODULE_VERMAGIC_RETPOLINE ""
+-#endif
+ 
+ #define VERMAGIC_STRING 						\
+ 	UTS_RELEASE " "							\
+ 	MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT 			\
+ 	MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS	\
+-	MODULE_ARCH_VERMAGIC						\
+-	MODULE_VERMAGIC_RETPOLINE
++	MODULE_ARCH_VERMAGIC
+ 
diff --git a/queue-4.9/series b/queue-4.9/series
index 7ba81fee119..6ba711da5e9 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -23,3 +23,4 @@ reiserfs-fix-race-in-prealloc-discard.patch
 reiserfs-don-t-preallocate-blocks-for-extended-attributes.patch
 fs-fcntl-f_setown-avoid-undefined-behaviour.patch
 scsi-libiscsi-fix-shifting-of-did_requeue-host-byte.patch
+revert-module-add-retpoline-tag-to-vermagic.patch