From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225qonQ9rhnqWtrwoa3wuBzev6hoMgco9Url384B+pfRihxxyhuj8VkEixoZg31pG8kB4AeB ARC-Seal: i=1; a=rsa-sha256; t=1517256645; cv=none; d=google.com; s=arc-20160816; b=mYLs764bxkUpRasrd0FonB0cYGVYZfXEJLAHVIEktXz/wwEn+hrSjbnAY6jPeYwMaE vaWXuXmfzW3q20oUVhs8q/CkClg4tPXQF9a/5Hq6gIBhNh5O4HCQnExYCz+R2UAGvyZd gmYBS01I+s1kt/JYqCZYG+7v5ySYPCjT76ZoDdNlRfiqw4mGa3y8VzJ/Ref0aSFv9o+O 38+XM0DrfqqAb/urCW/p8D2P1KSluh6f6NLVPbGYs1hGiPfLyB36yU9NM9XU5kp/dznr ivNzc7pA2sOQabEl/rCpL26AwmOxe5O3XxTTYOIKRCNZukypgM0tC6XToEgez8Z9KNBG Zgqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=KPfr8xWm0fgrJZCwOm2r8BRQKJiTGN0VHUGDCyrsiRk=; b=lRRC9QA/y/Zqc0GxtQgQHSijR45zKtrQkakJquoyvx/KrXjl96sRnQsVOJkRn83WYx +2oHwdVvcCT8gBFBhu0hjWN59Jv5/5vHCt2WFpZgxAxVwv6I11EG4mTi8f+khvvkSiqC HgbbfBuooxdDZZn1Ee+Wf6sv+gpcsYbSfw+pDv5UEwulCn/AvhRbokmH4FKhyyA/zY+L kdAacAZ4O7EaJj6hdil5wri2DY5GAZoHRZXhLf/twSKeEUO9kVW545XYjjWRqYqLoVJy A9iVhGtkuXqSKt9DYae2UFc3WBtNeaZ2dlOmuSSx7g9UoVz/SHNGED9KZAB6qvGNeAH/ DRog== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Kosina , Andi Kleen , Thomas Gleixner , David Woodhouse , rusty@rustcorp.com.au, arjan.van.de.ven@intel.com, jeyu@kernel.org, Linus Torvalds Subject: [PATCH 4.14 07/71] Revert "module: Add retpoline tag to VERMAGIC" Date: Mon, 29 Jan 2018 13:56:35 +0100 Message-Id: <20180129123827.808894291@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123827.271171825@linuxfoundation.org> References: <20180129123827.271171825@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590958642314373706?= X-GMAIL-MSGID: =?utf-8?q?1590958904297232291?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman 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 Fixes: 6cfb521ac0d5 ("module: Add retpoline tag to VERMAGIC") Acked-by: Andi Kleen Cc: Thomas Gleixner Cc: David Woodhouse Cc: rusty@rustcorp.com.au Cc: arjan.van.de.ven@intel.com Cc: jeyu@kernel.org Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- include/linux/vermagic.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) --- a/include/linux/vermagic.h +++ b/include/linux/vermagic.h @@ -31,17 +31,11 @@ #else #define MODULE_RANDSTRUCT_PLUGIN #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_RANDSTRUCT_PLUGIN \ - MODULE_VERMAGIC_RETPOLINE + MODULE_RANDSTRUCT_PLUGIN