aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-kernel/linux/linux-yocto-4.9.21/0091-Revert-module-Add-retpoline-tag-to-VERMAGIC.patch
diff options
context:
space:
mode:
Diffstat (limited to 'common/recipes-kernel/linux/linux-yocto-4.9.21/0091-Revert-module-Add-retpoline-tag-to-VERMAGIC.patch')
-rw-r--r--common/recipes-kernel/linux/linux-yocto-4.9.21/0091-Revert-module-Add-retpoline-tag-to-VERMAGIC.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/common/recipes-kernel/linux/linux-yocto-4.9.21/0091-Revert-module-Add-retpoline-tag-to-VERMAGIC.patch b/common/recipes-kernel/linux/linux-yocto-4.9.21/0091-Revert-module-Add-retpoline-tag-to-VERMAGIC.patch
deleted file mode 100644
index 6ea33fd5..00000000
--- a/common/recipes-kernel/linux/linux-yocto-4.9.21/0091-Revert-module-Add-retpoline-tag-to-VERMAGIC.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From b7a806693ec8ac8b5872e5a3de8fddd43600165f Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Wed, 24 Jan 2018 15:28:17 +0100
-Subject: [PATCH 091/103] Revert "module: Add retpoline tag to VERMAGIC"
-
-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(-)
-
-diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
-index a3d0493..6f8fbcf 100644
---- 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
-
---
-2.7.4
-