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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 195F1C433EF for ; Wed, 22 Sep 2021 17:03:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0225761353 for ; Wed, 22 Sep 2021 17:03:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236955AbhIVREf (ORCPT ); Wed, 22 Sep 2021 13:04:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236904AbhIVREX (ORCPT ); Wed, 22 Sep 2021 13:04:23 -0400 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B180C061762; Wed, 22 Sep 2021 10:02:53 -0700 (PDT) Received: by mail-pg1-x533.google.com with SMTP id r2so3346178pgl.10; Wed, 22 Sep 2021 10:02:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fkhLdmrHmkgMMt1LbOtoU8XmiMwNfTKIfISAPG6mWV4=; b=AWLGCnuYxvuHY/eWdFDPkxcQLv7jJZh8vwJ7d8A6cIa3eww6dqaGbOnRFMNnTO0R/V RF3kvi571krgpjhGf29g5i9m8OOQsee1GkHzR9MgjeeQL8LvOnlLqpqAqUoAq5qjnCtl AoqY9UKJJpuevK+UaFl2RVLNMBzbw2zxeDuLK7YIwbW5t9+N+w01gl0LLO5IeLj9JALm OFOLia3GjbBJUoSvomNY8TnzS+0Gytyt/s8KiqqHJWNYfeqczxqK+7UyrlkzgZ42Xsl4 mtOLrscUz/uzg6Sgw8ckqzGlcoinHeon8chJZ0I1Y2wY7lialFu5bo/kPWvn45y1+yd7 iCRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fkhLdmrHmkgMMt1LbOtoU8XmiMwNfTKIfISAPG6mWV4=; b=7ZGPSynq5ihe0GAu0wGenr3qYKxv2Yvnnqscv/N43gwy87u+XQR+TtohaVChsUeI1F mndHj8DpSOte1YDqnYaonU1BDdqiwtFefi+ryQPLaBtPJQ89I6hxIAG6ThwabtSV2974 9YkF1p5mIFMUedsUYYi5LKDp58l8Ps0cAsUseUYfKf2xYDy2zQCuXI7DwrTp5bHOvDRr uqnXaG+8KJZu3xU6V5E5UldqGRp3Sn9YzoFsbTeLEddXnsMVA1BuLsrVASEpq11zZBMu FR/UQeeecVrCY8o/jTfiZ3tiTpOixD8m4xCUF21GG1kgETOG6lWoBEFlojZg7xzTWutg 1E4w== X-Gm-Message-State: AOAM530xiw10+Vc9/TPCBi9lOShhkH9Y/Hlz4pdZPR4jlTbajiB9osPG W2CSzDWZRgrFUWSjqV/Kk+zoE1Zf8u8= X-Google-Smtp-Source: ABdhPJyq1J1vpE3mVxEq0jyvGL3dsAj/ovf2W3NVRIDnonFLCptD7fJ0s4Opf9VFyO8EYgfQ7iV0OA== X-Received: by 2002:a05:6a00:1ad0:b0:448:3f3a:5ad with SMTP id f16-20020a056a001ad000b004483f3a05admr161170pfv.63.1632330172243; Wed, 22 Sep 2021 10:02:52 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id x128sm3061885pfd.203.2021.09.22.10.02.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 10:02:51 -0700 (PDT) From: Florian Fainelli 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) Subject: [PATCH stable 4.9 v2 1/4] ARM: 9077/1: PLT: Move struct plt_entries definition to header Date: Wed, 22 Sep 2021 10:02:43 -0700 Message-Id: <20210922170246.190499-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210922170246.190499-1-f.fainelli@gmail.com> References: <20210922170246.190499-1-f.fainelli@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/arm/include/asm/module.h | 9 +++++++++ arch/arm/kernel/module-plts.c | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h index ed2319663a1e..2e9872a22359 100644 --- a/arch/arm/include/asm/module.h +++ b/arch/arm/include/asm/module.h @@ -18,6 +18,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; diff --git a/arch/arm/kernel/module-plts.c b/arch/arm/kernel/module-plts.c index 3d0c2e4dda1d..f272711c411f 100644 --- 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; -- 2.25.1 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 X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4CF19C433F5 for ; Wed, 22 Sep 2021 17:21:20 +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 1686960FE6 for ; Wed, 22 Sep 2021 17:21:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1686960FE6 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ktR4E0NPfNULgp/Ke7Bq6U0kqyIhDWjhLZqHf/mUsAw=; b=KB3FJMNL0NnhNn gZp3BLi9OTqtUNbjCcVxjzGypFPk2EKWq8ex9Hb7kNPkv4VA/vluRwm1pzuycBaf2wiUlt+2zV5qo 3hWdC0eqgulWcv31u42u89d6tc4mToLwOJ3++JyVb22GX3b/1uievdVPpp8VFYa0g8KbXqZ58jvRY dGA99FR0JR/dq2zyfUxvktmDPl3xuDn3dsFLVMXToYhnOTsKcjqpXqoCFQ9j3HMq6HCRosNloGHpz dRWQAyPgXNGK9J4W9CKjpHLotr50frf5dhuBs0BqOq3hr9lJ1tq4hKBRCAHK6niltBgveeOzm9iQc BUTsQrpc7Q8Lk+MDegTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mT5st-009IYp-Tw; Wed, 22 Sep 2021 17:18:16 +0000 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mT5e1-009Cnu-Bo for linux-arm-kernel@lists.infradead.org; Wed, 22 Sep 2021 17:02:56 +0000 Received: by mail-pg1-x52a.google.com with SMTP id h3so3362972pgb.7 for ; Wed, 22 Sep 2021 10:02:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fkhLdmrHmkgMMt1LbOtoU8XmiMwNfTKIfISAPG6mWV4=; b=AWLGCnuYxvuHY/eWdFDPkxcQLv7jJZh8vwJ7d8A6cIa3eww6dqaGbOnRFMNnTO0R/V RF3kvi571krgpjhGf29g5i9m8OOQsee1GkHzR9MgjeeQL8LvOnlLqpqAqUoAq5qjnCtl AoqY9UKJJpuevK+UaFl2RVLNMBzbw2zxeDuLK7YIwbW5t9+N+w01gl0LLO5IeLj9JALm OFOLia3GjbBJUoSvomNY8TnzS+0Gytyt/s8KiqqHJWNYfeqczxqK+7UyrlkzgZ42Xsl4 mtOLrscUz/uzg6Sgw8ckqzGlcoinHeon8chJZ0I1Y2wY7lialFu5bo/kPWvn45y1+yd7 iCRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fkhLdmrHmkgMMt1LbOtoU8XmiMwNfTKIfISAPG6mWV4=; b=vc7UFlJShZP9Yw45x2A8tiBqe81aCZNH9XfSqva1vB700nbQc2x+gRxHMHkI0+mpIp W94ARxwSFQnECB/FsX+YBEOyxKI87uyuV5Q7x4GRqW6UdGDzsV7IHLGtWjyR5HcjbUpH BHZkDf/0NDZCzJN56ygxXAGfw/ebtSaBgKIA77lerPCblBx1eMkPwDK+Ylh47V2A2SRr XKtneeGPQe12Dc1yW3a01gz8DXx6LkDqbSQzW173FbrSc7m8ugPD01Ph8JlDlJFpGA83 8UVFD5KQCXWBOFUIEdWVs141FpRVOqvYDlrt6a7OZYA2kwD81umvP2W/R1LqWA7DfBVB UPNA== X-Gm-Message-State: AOAM531KFKonhkv/iPgqMHLpVmt+HMFzqxZTb4AeolXkodTaGDEnk+XR X0sjn7Akkdn+vKHSJ3ok9wYywihb6OM= X-Google-Smtp-Source: ABdhPJyq1J1vpE3mVxEq0jyvGL3dsAj/ovf2W3NVRIDnonFLCptD7fJ0s4Opf9VFyO8EYgfQ7iV0OA== X-Received: by 2002:a05:6a00:1ad0:b0:448:3f3a:5ad with SMTP id f16-20020a056a001ad000b004483f3a05admr161170pfv.63.1632330172243; Wed, 22 Sep 2021 10:02:52 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id x128sm3061885pfd.203.2021.09.22.10.02.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 10:02:51 -0700 (PDT) From: Florian Fainelli 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) Subject: [PATCH stable 4.9 v2 1/4] ARM: 9077/1: PLT: Move struct plt_entries definition to header Date: Wed, 22 Sep 2021 10:02:43 -0700 Message-Id: <20210922170246.190499-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210922170246.190499-1-f.fainelli@gmail.com> References: <20210922170246.190499-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210922_100253_501637_C3D67F9A X-CRM114-Status: GOOD ( 13.20 ) 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 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 --- arch/arm/include/asm/module.h | 9 +++++++++ arch/arm/kernel/module-plts.c | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h index ed2319663a1e..2e9872a22359 100644 --- a/arch/arm/include/asm/module.h +++ b/arch/arm/include/asm/module.h @@ -18,6 +18,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; diff --git a/arch/arm/kernel/module-plts.c b/arch/arm/kernel/module-plts.c index 3d0c2e4dda1d..f272711c411f 100644 --- 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; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel