From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1550FC433EF for ; Mon, 4 Oct 2021 11:26:23 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D990A61207 for ; Mon, 4 Oct 2021 11:26:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D990A61207 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-Reply-To: Date:From:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=xmYWNWtY/E72Azyu8/zWe2OT95hfP5ogk4bgGZMAXXE=; b=aG3AsDO2zAq9+p KWJihHi+o5VN+nxs+ruJGplMKJMk+mGtAgwbDZgUjGO6O3RZJX5ZfXZaOFeXmdoCLB0UCYHdhj4Tz o1MGCocYqIWka2UN6hDqTPci1x2RqBwl7nUtwn59llGrsgLImkuK3l1Kh91Ca3frREWgIsEMv2QQT AYH9FjLHwHixKK0wgcSSr8ml1snTlg8GNGWd29AKs0OR6i4XmhiOGWJ5dUtjaXv2umgFRQpnf+Frr Lyfp2YcWyJ4FPSA3FAd7caKUqWD6MGEodGYK3UY1SG8uO0FTrSn1/1kVtaok4nT/dM7iJDr+k7YGb 835jMPTY2nqbX2jm84vg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXM4K-0068a7-9W; Mon, 04 Oct 2021 11:23:40 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXM2a-0067ZG-68 for linux-arm-kernel@lists.infradead.org; Mon, 04 Oct 2021 11:21:53 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6C495613A8; Mon, 4 Oct 2021 11:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633346511; bh=I9SEN6c3iiM76Jg9Rcioo/PnzaY16zxrlI17GwR/VI0=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=wBY2WnemxTraw7IjN25U9iMEvEsczKkE8vZm4pBRpOrd/RW8b9SGlwiaDYq1DZ0eA Tfqh8UxQ8RM1pf+dR3CbnBs3W/pQTCBDC6czTRNRyXg7N5gSgKgns9ZaK9NQgUUMC5 PJrpSG5f+IH0jSQiG9ZtW8V6h9JOFt0kGtUnu2Z0= Subject: Patch "ARM: 9077/1: PLT: Move struct plt_entries definition to header" has been added to the 4.14-stable tree To: alexander.sverdlin@nokia.com, f.fainelli@gmail.com, gregkh@linuxfoundation.org, linux-arm-kernel@lists.infradead.org, linux@armlinux.org.uk, mingo@redhat.com, rmk+kernel@armlinux.org.uk, rostedt@goodmis.org, sashal@kernel.org Cc: From: Date: Mon, 04 Oct 2021 13:21:35 +0200 In-Reply-To: <20210927210259.3216965-2-f.fainelli@gmail.com> Message-ID: <1633346495178111@kroah.com> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211004_042152_317304_9DEE79AD X-CRM114-Status: GOOD ( 13.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This is a note to let you know that I've just added the patch titled ARM: 9077/1: PLT: Move struct plt_entries definition to header to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: arm-9077-1-plt-move-struct-plt_entries-definition-to-header.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From foo@baz Mon Oct 4 01:06:28 PM CEST 2021 From: Florian Fainelli Date: Mon, 27 Sep 2021 14:02:56 -0700 Subject: ARM: 9077/1: PLT: Move struct plt_entries definition to header To: linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Greg Kroah-Hartman , Sasha Levin , Alex Sverdlin , Russell King , Florian Fainelli , Steven Rostedt , Ingo Molnar , Russell King , linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT) Message-ID: <20210927210259.3216965-2-f.fainelli@gmail.com> From: Alex Sverdlin commit 4e271701c17dee70c6e1351c4d7d42e70405c6a9 upstream No functional change, later it will be re-used in several files. Signed-off-by: Alexander Sverdlin Signed-off-by: Russell King Signed-off-by: Florian Fainelli Signed-off-by: Greg Kroah-Hartman --- arch/arm/include/asm/module.h | 9 +++++++++ arch/arm/kernel/module-plts.c | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) --- a/arch/arm/include/asm/module.h +++ b/arch/arm/include/asm/module.h @@ -19,6 +19,15 @@ enum { }; #endif +#define PLT_ENT_STRIDE L1_CACHE_BYTES +#define PLT_ENT_COUNT (PLT_ENT_STRIDE / sizeof(u32)) +#define PLT_ENT_SIZE (sizeof(struct plt_entries) / PLT_ENT_COUNT) + +struct plt_entries { + u32 ldr[PLT_ENT_COUNT]; + u32 lit[PLT_ENT_COUNT]; +}; + struct mod_plt_sec { struct elf32_shdr *plt; int plt_count; --- a/arch/arm/kernel/module-plts.c +++ b/arch/arm/kernel/module-plts.c @@ -14,10 +14,6 @@ #include #include -#define PLT_ENT_STRIDE L1_CACHE_BYTES -#define PLT_ENT_COUNT (PLT_ENT_STRIDE / sizeof(u32)) -#define PLT_ENT_SIZE (sizeof(struct plt_entries) / PLT_ENT_COUNT) - #ifdef CONFIG_THUMB2_KERNEL #define PLT_ENT_LDR __opcode_to_mem_thumb32(0xf8dff000 | \ (PLT_ENT_STRIDE - 4)) @@ -26,11 +22,6 @@ (PLT_ENT_STRIDE - 8)) #endif -struct plt_entries { - u32 ldr[PLT_ENT_COUNT]; - u32 lit[PLT_ENT_COUNT]; -}; - static bool in_init(const struct module *mod, unsigned long loc) { return loc - (u32)mod->init_layout.base < mod->init_layout.size; Patches currently in stable-queue which might be from f.fainelli@gmail.com are queue-4.14/arm-9098-1-ftrace-module_plt-fix-build-problem-without-dynamic_ftrace.patch queue-4.14/arm-9079-1-ftrace-add-module_plts-support.patch queue-4.14/arm-9078-1-add-warn-suppress-parameter-to-arm_gen_branch_link.patch queue-4.14/arm-9077-1-plt-move-struct-plt_entries-definition-to-header.patch _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel