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 A4114C433FE for ; Wed, 22 Sep 2021 17:01:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E3E1610A1 for ; Wed, 22 Sep 2021 17:01:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236807AbhIVRDY (ORCPT ); Wed, 22 Sep 2021 13:03:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36636 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236706AbhIVRDX (ORCPT ); Wed, 22 Sep 2021 13:03:23 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0529DC061574; Wed, 22 Sep 2021 10:01:53 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id k17so3249180pff.8; Wed, 22 Sep 2021 10:01: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=RE9qlrpj4A/Ec+OQwHI70Yn7GuZgbAKhGWX1AXM0xpo=; b=NcoCwUx1Vysb5fmvfESOEvUJ4lGbJFrhbHeO5GgrhqCDDeow5AQdpe98mTj/wEzxfM 25ps7EymFUZN209QD8Gutk4NT328sEaFF8a/06Cx9ZwWrZhbAAK45pYGy0T7/kQKsGN6 C+YoUCC/CFDV50Bu2fcOPhlAl9JeW2YgkRP5nrWVMUSviSusf+UPpQ1jE+mleSzoQABk gmzanpHv9dpuCzaXZLRoydQ6zSvg04xi/ZKTtZfzjOXxCWJy3xoRnirCmt4/NewzMnUn TBPEsNEjndTum5nB3FyLappH3m/vEIf7vLaL8rvtOSHj0hLpgRsSjzscFFz4EqNtWpRl mYhA== 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=RE9qlrpj4A/Ec+OQwHI70Yn7GuZgbAKhGWX1AXM0xpo=; b=FTlc9ARIKxcDeDVB2lRqMZDKY9GeWwcuxtKJpJCuX8nZbpzTiMGC8V85ATz90ARW48 /jTAKTK06hKLuHhB1+5noXSNyCeedmDq2tmjJqVUjAfc+HkGCJvskFy1HnrHlKuO4Kp6 MX7hDHdGbfo72FwpgxKn9JRa+v3mRPA7Hs7xhVyeD/O68ceEZh4I3yEvrwrLrSfCGyb1 /o5/keWibzCghdTlo+6KOurgrYyoQka2a0H5y8/+nYRHHEoKkNqpNVQGzksvAUU0fi5W CfVcwT4utvtFeMLENm05SuQjVdJhPU7qaHg3KGYp4bZhZQlL/7ShT8Hj2n3Sn9q4V7yC O3XA== X-Gm-Message-State: AOAM532s5ksUJuQQx2/cor8Pd6Fi0u7rY9880JgqgZB1AnPZC/frN5PF uC4K8EaaLt2a/9R341U4e7FtfFz7dg4= X-Google-Smtp-Source: ABdhPJwx/1HPx00NTjTAXQh2HacGrpLfSM+X0rlcbfDvDbY0C5D1ORscK26/URfhsK8teJ7f0Y9UNA== X-Received: by 2002:a63:3d4c:: with SMTP id k73mr674652pga.44.1632330112224; Wed, 22 Sep 2021 10:01:52 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j7sm3101087pfh.168.2021.09.22.10.01.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Sep 2021 10:01: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.19 v2 1/4] ARM: 9077/1: PLT: Move struct plt_entries definition to header Date: Wed, 22 Sep 2021 10:01:25 -0700 Message-Id: <20210922170128.190321-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210922170128.190321-1-f.fainelli@gmail.com> References: <20210922170128.190321-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 9e81b7c498d8..56d4c97e578a 100644 --- 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; 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