tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Revert "module: Add retpoline tag to VERMAGIC"

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
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Greg Kroah-Hartman and committed by
Linus Torvalds 5132ede0 1f07476e

+1 -7
+1 -7
include/linux/vermagic.h
··· 31 31 #else 32 32 #define MODULE_RANDSTRUCT_PLUGIN 33 33 #endif 34 - #ifdef RETPOLINE 35 - #define MODULE_VERMAGIC_RETPOLINE "retpoline " 36 - #else 37 - #define MODULE_VERMAGIC_RETPOLINE "" 38 - #endif 39 34 40 35 #define VERMAGIC_STRING \ 41 36 UTS_RELEASE " " \ 42 37 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \ 43 38 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \ 44 39 MODULE_ARCH_VERMAGIC \ 45 - MODULE_RANDSTRUCT_PLUGIN \ 46 - MODULE_VERMAGIC_RETPOLINE 40 + MODULE_RANDSTRUCT_PLUGIN 47 41