From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x224eyFPOE6aNl7WQSJxa0kZZm1etLA208paMUm+eiKRPhpXGY1tcBaGE/67fn3ZJyLxMBsLV ARC-Seal: i=1; a=rsa-sha256; t=1517256625; cv=none; d=google.com; s=arc-20160816; b=wKgBrmxpQo5gfFt8idpVIX8n7pLe+QzZuCNYM4CJqRRxnR4MtkEGd0yGl2iBvTKq/o 5p74D1D9q4v0xqt2sdg4N9wz/h8gRmd5yc1vxKcvqlhtj5sVRvX+aB//TES/eUUhddEz RC4yaJlWNkVPhpucLgQPsnw3YlqZpuLL/0OuoAlcbMlEsWrz5a/3U/uOyYQr8z6qT5dn Dq4vv1w5ZCpcfnfErdQ9y1ATtFalgXGwSTAfFccNsvzZ96Veklb+zzAUugjI7Zc3VNrt ZIp1sTx89Bnz5Ct+YQNTM9/wcb7qNRE5gou6vY64dDCG9tzIS63gxXAkBuP4qiZGYue6 lYGQ== 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=hfyOr05nuBS0dyP5J2OSmVCXXYf11dDj/Au+zZs3SfQ=; b=RWyNve9atZPdiYR542LePo0sddpIqra8btNKmkWqMSSI9falPPNgzTze+yVJCffAOQ JK9RP34gMT+3t32umuBD6x1ARn1p7jcfyGf9K8KzIfMyHwd7gswtrpT1GceI3vCj1aPj mpJkAiXfSL4nXl2qzYoBkQ/oz8Cr2BkgG7FhHxQ/fB2uhNOdGGorYr/NGNgfadE073AB q/8ZyBQxyd1df7IoMi/tPT12XKpU7/+52jdYekHZbu5877u0TGAHyyC0//HnWVMp/qQb SJsd0SeTkD7aRJisPfROupHvnaLSIikHY3Fr6/q9uGH2Ftql/ekeHJMg03B9TjzULjHr se6Q== 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.4 47/74] Revert "module: Add retpoline tag to VERMAGIC" Date: Mon, 29 Jan 2018 13:56:52 +0100 Message-Id: <20180129123849.712624896@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180129123847.507563674@linuxfoundation.org> References: <20180129123847.507563674@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?1590958883316236910?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.4-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 @@ -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