From patchwork Mon Apr 1 13:29:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1072782 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44XtVB47SJz9sNg; Tue, 2 Apr 2019 00:29:22 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1hAx01-00067n-Lu; Mon, 01 Apr 2019 13:29:17 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1hAwzz-00065c-0E for kernel-team@lists.ubuntu.com; Mon, 01 Apr 2019 13:29:15 +0000 Received: from mail-ed1-f70.google.com ([209.85.208.70]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1hAwzy-0003l8-Ny for kernel-team@lists.ubuntu.com; Mon, 01 Apr 2019 13:29:14 +0000 Received: by mail-ed1-f70.google.com with SMTP id 41so4413857edr.19 for ; Mon, 01 Apr 2019 06:29:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+dRkiD2PpwWI2PsF5Nd/X9/1XSj395Tge4UNg7GiZ1Q=; b=UoJ70gQSmuDKZ/wiSyypVMMZ7rU/ik6m9hk2BOqu6FFLzS6PkQYAQZdnoYGla3AkQC c5WdP3MF3IsALinAEBPTylpKZ5JlTf3QqT+LYfqKCGN1iq0Jx5XmcO1+qZQnJLA2hSDd LlEiImMTGAHpSvOIAJ9+iBUjZDFI4tv1KQuaExFvl25JVMRwpsHzQ0397mBGw3wo5bIo FwvOAdqxae6CfzDj6kGM8FcbAi6WxOz1mYbSZmQie3st/PztLcPNX5rMH8RiUDBoYmA0 MzmjMkqH7o93+oBwSCUjcHYx9Pb+qviW7OdrhjPCsipYMY9dBH8heMEzc+VeFLlqwcJ5 NAjg== X-Gm-Message-State: APjAAAUljMWQ1wclac3dm3st2ZBWkK3yWabQWTMkcC7qz2vgkj+6ij5F kbQ2AOdpGnVHheiSTW9LKi2SanLyXCmHB1+GIb7mjEwChtaP5bBissSQiJ3gq7LqovHB2payeW8 UCBUrw/KkvnBWLRT0pHHHkwVMY2FOWJ6B07QPKiQLCg== X-Received: by 2002:a50:95fa:: with SMTP id x55mr40347232eda.49.1554125354257; Mon, 01 Apr 2019 06:29:14 -0700 (PDT) X-Google-Smtp-Source: APXvYqwvtMSzR5hmsx6MuU6RI8afnsnq/2kUMvSEek/4ugJt/5OW8yscJpiIkL5DBAVDUnl+us2R0A== X-Received: by 2002:a50:95fa:: with SMTP id x55mr40347220eda.49.1554125354077; Mon, 01 Apr 2019 06:29:14 -0700 (PDT) Received: from gollum.fritz.box ([81.221.192.120]) by smtp.gmail.com with ESMTPSA id d37sm3231146ede.79.2019.04.01.06.29.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 06:29:13 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][Xenial][PATCH 4/4] Revert "module: Add retpoline tag to VERMAGIC" Date: Mon, 1 Apr 2019 15:29:07 +0200 Message-Id: <20190401132907.24823-5-juergh@canonical.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190401132907.24823-1-juergh@canonical.com> References: <20190401132907.24823-1-juergh@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Greg Kroah-Hartman BugLink: https://bugs.launchpad.net/bugs/1820872 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 Cc: stable Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds (backported from commit 5132ede0fe8092b043dae09a7cc32b8ae7272baa) [juergh: Adjusted context.] Signed-off-by: Juerg Haefliger --- 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 a3d04934aa96..6f8fbcf10dfb 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